From 590f44146421e193b0676825a96dd3bd88f2e918 Mon Sep 17 00:00:00 2001 From: Diego Sampaio Date: Thu, 10 Feb 2022 10:48:48 -0300 Subject: [PATCH 1/3] Update Meteor to 3.5.6 --- .meteor/packages | 4 ++-- .meteor/release | 2 +- .meteor/versions | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.meteor/packages b/.meteor/packages index 0be8da158f2a..d0409837d195 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -67,7 +67,7 @@ littledata:synced-cron edgee:slingshot jalik:ufs-local@1.0.2 -accounts-base@2.2.0 +accounts-base@2.2.1 accounts-oauth@1.4.0 autoupdate@1.8.0 babel-compiler@7.8.0 @@ -76,7 +76,7 @@ htmljs less matb33:collection-hooks meteorhacks:inject-initial -oauth@2.1.0 +oauth@2.1.1 oauth2@1.3.1 routepolicy@1.1.1 sha@1.0.9 diff --git a/.meteor/release b/.meteor/release index c2ff29ae85a8..0150b11e9f5b 100644 --- a/.meteor/release +++ b/.meteor/release @@ -1 +1 @@ -METEOR@2.5.3 +METEOR@2.5.6 diff --git a/.meteor/versions b/.meteor/versions index f0bba23468b2..7ba89bd6e6f9 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -1,4 +1,4 @@ -accounts-base@2.2.0 +accounts-base@2.2.1 accounts-facebook@1.3.3 accounts-github@1.5.0 accounts-google@1.4.0 From bb98d1fc926e486b8388fa4bf3af719c9d785ac5 Mon Sep 17 00:00:00 2001 From: Diego Sampaio Date: Thu, 10 Feb 2022 10:49:05 -0300 Subject: [PATCH 2/3] Update Node version --- .docker-mongo/Dockerfile | 2 +- .docker/Dockerfile | 2 +- .github/workflows/build_and_test.yml | 16 ++++++++-------- .snapcraft/resources/preparenode | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.docker-mongo/Dockerfile b/.docker-mongo/Dockerfile index 56b809851faf..2e92d78bcb0a 100644 --- a/.docker-mongo/Dockerfile +++ b/.docker-mongo/Dockerfile @@ -1,4 +1,4 @@ -FROM node:14.18.2-bullseye-slim +FROM node:14.18.3-bullseye-slim LABEL maintainer="buildmaster@rocket.chat" diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 316c5e7d8946..fb2cc092daa3 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -1,4 +1,4 @@ -FROM node:14.18.2-bullseye-slim +FROM node:14.18.3-bullseye-slim LABEL maintainer="buildmaster@rocket.chat" diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index a3c13673daa2..6ca7c176d815 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -30,10 +30,10 @@ jobs: echo "github.event_name: ${{ github.event_name }}" cat $GITHUB_EVENT_PATH - - name: Use Node.js 14.18.2 + - name: Use Node.js 14.18.3 uses: actions/setup-node@v2 with: - node-version: "14.18.2" + node-version: "14.18.3" - uses: actions/checkout@v2 @@ -186,7 +186,7 @@ jobs: strategy: matrix: - node-version: ["14.18.2"] + node-version: ["14.18.3"] mongodb-version: ["3.6", "4.0", "4.2", "4.4","5.0"] steps: @@ -324,10 +324,10 @@ jobs: path: ~/.meteor key: ${{ runner.OS }}-meteor-${{ hashFiles('.meteor/release', '.github/workflows/build_and_test.yml') }} - - name: Use Node.js 14.18.2 + - name: Use Node.js 14.18.3 uses: actions/setup-node@v2 with: - node-version: "14.18.2" + node-version: "14.18.3" - name: Install Meteor run: | @@ -467,7 +467,7 @@ jobs: aws s3 cp $ROCKET_DEPLOY_DIR/ s3://download.rocket.chat/build/ --recursive curl -H "Content-Type: application/json" -H "X-Update-Token: $UPDATE_TOKEN" -d \ - "{\"nodeVersion\": \"14.18.2\", \"compatibleMongoVersions\": [\"3.6\", \"4.0\", \"4.2\", \"4.4\", \"5.0\"], \"commit\": \"$GITHUB_SHA\", \"tag\": \"$RC_VERSION\", \"branch\": \"$GIT_BRANCH\", \"artifactName\": \"$ARTIFACT_NAME\", \"releaseType\": \"$RC_RELEASE\"}" \ + "{\"nodeVersion\": \"14.18.3\", \"compatibleMongoVersions\": [\"3.6\", \"4.0\", \"4.2\", \"4.4\", \"5.0\"], \"commit\": \"$GITHUB_SHA\", \"tag\": \"$RC_VERSION\", \"branch\": \"$GIT_BRANCH\", \"artifactName\": \"$ARTIFACT_NAME\", \"releaseType\": \"$RC_RELEASE\"}" \ https://releases.rocket.chat/update # Makes build fail if the release isn't there @@ -609,10 +609,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Use Node.js 14.18.2 + - name: Use Node.js 14.18.3 uses: actions/setup-node@v2 with: - node-version: "14.18.2" + node-version: "14.18.3" - name: Login to DockerHub uses: docker/login-action@v1 diff --git a/.snapcraft/resources/preparenode b/.snapcraft/resources/preparenode index 186fc26dd695..d6619dd9bf4d 100755 --- a/.snapcraft/resources/preparenode +++ b/.snapcraft/resources/preparenode @@ -1,6 +1,6 @@ #!/bin/bash -node_version="v14.18.2" +node_version="v14.18.3" unamem="$(uname -m)" if [[ $unamem == *aarch64* ]]; then From e3f8a7986bd606bbbfa725f6aeb502e159a0c77b Mon Sep 17 00:00:00 2001 From: Diego Sampaio Date: Thu, 10 Feb 2022 10:54:02 -0300 Subject: [PATCH 3/3] Update fibers dependency --- ee/server/services/package-lock.json | 6 +++--- ee/server/services/package.json | 2 +- package-lock.json | 6 +++--- package.json | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ee/server/services/package-lock.json b/ee/server/services/package-lock.json index 221e4bf1cc46..b35a4e34afd1 100644 --- a/ee/server/services/package-lock.json +++ b/ee/server/services/package-lock.json @@ -1275,9 +1275,9 @@ "dev": true }, "fibers": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/fibers/-/fibers-5.0.0.tgz", - "integrity": "sha512-UpGv/YAZp7mhKHxDvC1tColrroGRX90sSvh8RMZV9leo+e5+EkRVgCEZPlmXeo3BUNQTZxUaVdLskq1Q2FyCPg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/fibers/-/fibers-5.0.1.tgz", + "integrity": "sha512-VMC7Frt87Oo0AOJ6EcPFbi+tZmkQ4tD85aatwyWL6I9cYMJmm2e+pXUJsfGZ36U7MffXtjou2XIiWJMtHriErw==", "requires": { "detect-libc": "^1.0.3" } diff --git a/ee/server/services/package.json b/ee/server/services/package.json index 42e7e5cf080e..ad12df33322a 100644 --- a/ee/server/services/package.json +++ b/ee/server/services/package.json @@ -33,7 +33,7 @@ "ejson": "^2.2.2", "eventemitter3": "^4.0.7", "express": "^4.17.1", - "fibers": "^5.0.0", + "fibers": "^5.0.1", "jaeger-client": "^3.18.1", "mem": "^8.1.1", "moleculer": "^0.14.14", diff --git a/package-lock.json b/package-lock.json index 23ab1ada42ba..e96cbf7019d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19353,9 +19353,9 @@ "integrity": "sha512-VYM2Xy1gSA5MerKzCnmmuV2XljkpKwgJBKezW+495TTnTCh1x5HcYa1aH8wRU/MfTGhW4ziXqgwprgQUVl3Ohw==" }, "fibers": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/fibers/-/fibers-5.0.0.tgz", - "integrity": "sha512-UpGv/YAZp7mhKHxDvC1tColrroGRX90sSvh8RMZV9leo+e5+EkRVgCEZPlmXeo3BUNQTZxUaVdLskq1Q2FyCPg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/fibers/-/fibers-5.0.1.tgz", + "integrity": "sha512-VMC7Frt87Oo0AOJ6EcPFbi+tZmkQ4tD85aatwyWL6I9cYMJmm2e+pXUJsfGZ36U7MffXtjou2XIiWJMtHriErw==", "requires": { "detect-libc": "^1.0.3" } diff --git a/package.json b/package.json index da9ec1c8a1e7..e31f44eebb37 100644 --- a/package.json +++ b/package.json @@ -233,7 +233,7 @@ "express": "^4.17.1", "express-rate-limit": "^5.2.6", "fflate": "^0.7.1", - "fibers": "^5.0.0", + "fibers": "^5.0.1", "file-type": "^10.11.0", "filenamify": "^4.3.0", "filesize": "^3.6.1",