Merge pull request #686 from assistify/merge/3.8.9

Merge/3.8.9
assistify · Apr 6, 2021 · 3a87187 · 3a87187
2 parents ccc2746 + 3eaafd5
commit 3a87187
Show file tree

Hide file tree

Showing 19 changed files with 192 additions and 141 deletions.
diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.8.8
+ENV RC_VERSION 3.8.9
 
 MAINTAINER [email protected]
 

diff --git a/.github/history-manual.json b/.github/history-manual.json
@@ -49,5 +49,12 @@
 		"contributors": [
 			"sampaiodiego"
 		]
+	}],
+	"3.8.9": [{
+		"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
+		"userLogin": "sampaiodiego",
+		"contributors": [
+			"sampaiodiego"
+		]
 	}]
 }
diff --git a/.github/history.json b/.github/history.json
@@ -51892,6 +51892,17 @@
         "4.0"
       ],
       "pull_requests": []
+    },
+    "3.8.9": {
+      "node_version": "12.18.4",
+      "npm_version": "6.14.8",
+      "apps_engine_version": "1.19.0",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": []
     }
   }
 }
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -31,7 +31,7 @@ jobs:
         cat $GITHUB_EVENT_PATH
 
     - name: Use Node.js 12.18.4
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v2
       with:
         node-version: "12.18.4"
 
@@ -51,27 +51,27 @@ jobs:
 
     - name: Cache cypress
       id: cache-cypress
-      uses: actions/cache@v1
+      uses: actions/cache@v2
       with:
         path: /home/runner/.cache/Cypress
         key: ${{ runner.OS }}-cache-cypress-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('.github/workflows/build_and_test.yml') }}
 
     - name: Cache node modules
       if: steps.cache-cypress.outputs.cache-hit == 'true'
       id: cache-nodemodules
-      uses: actions/cache@v1
+      uses: actions/cache@v2
       with:
         path: node_modules
         key: ${{ runner.OS }}-node_modules-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('.github/workflows/build_and_test.yml') }}
 
     - name: Cache meteor local
-      uses: actions/cache@v1
+      uses: actions/cache@v2
       with:
         path: ./.meteor/local
         key: ${{ runner.OS }}-meteor_cache-${{ hashFiles('.meteor/versions') }}-${{ hashFiles('.github/workflows/build_and_test.yml') }}
 
     - name: Cache meteor
-      uses: actions/cache@v1
+      uses: actions/cache@v2
       with:
         path: ~/.meteor
         key: ${{ runner.OS }}-meteor-${{ hashFiles('.meteor/release') }}-${{ hashFiles('.github/workflows/build_and_test.yml') }}
@@ -122,6 +122,12 @@ jobs:
 
     - run: meteor npm run typecheck
 
+    - name: Build Storybook to sanity check components
+      run: npm run build-storybook ; rm -rf ./storybook-static
+      env:
+        NODE_OPTIONS: --max_old_space_size=8192
+
+
     # To reduce memory need during actual build, build the packages solely first
     # - name: Build a Meteor cache
     #   run: |
@@ -137,6 +143,13 @@ jobs:
       run: |
         meteor reset
 
+    - name: Try building micro services
+      run: |
+        cd ./ee/server/services
+        npm i
+        npm run build
+        rm -rf dist/
+
     - name: Build Rocket.Chat From Pull Request
       if: startsWith(github.ref, 'refs/pull/') == true
       env:
@@ -160,13 +173,13 @@ jobs:
         tar czf Rocket.Chat.test.tar.gz ./build-test
 
     - name: Store build for tests
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v2
       with:
         name: build-test
         path: /tmp/Rocket.Chat.test.tar.gz
 
     - name: Store build
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v2
       with:
         name: build
         path: /tmp/build
@@ -187,7 +200,7 @@ jobs:
         mongoDBVersion: ${{ matrix.mongodb-version }} --noprealloc --smallfiles --replSet=rs0
 
     - name: Restore build for tests
-      uses: actions/download-artifact@v1
+      uses: actions/download-artifact@v2
       with:
         name: build-test
         path: /tmp
@@ -199,7 +212,7 @@ jobs:
         cd -
 
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v2
       with:
         node-version: ${{ matrix.node-version }}
 
@@ -216,15 +229,15 @@ jobs:
 
     - name: Cache cypress
       id: cache-cypress
-      uses: actions/cache@v1
+      uses: actions/cache@v2
       with:
         path: /home/runner/.cache/Cypress
         key: ${{ runner.OS }}-cache-cypress-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('.github/workflows/build_and_test.yml') }}
 
     - name: Cache node modules
       if: steps.cache-cypress.outputs.cache-hit == 'true'
       id: cache-nodemodules
-      uses: actions/cache@v1
+      uses: actions/cache@v2
       with:
         path: node_modules
         key: ${{ runner.OS }}-build-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('.github/workflows/build_and_test.yml') }}
@@ -282,25 +295,25 @@ jobs:
 
     - name: Cache node modules
       id: cache-nodemodules
-      uses: actions/cache@v1
+      uses: actions/cache@v2
       with:
         path: node_modules
         key: ${{ runner.OS }}-node_modules-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('.github/workflows/build_and_test.yml') }}
 
     - name: Cache meteor local
-      uses: actions/cache@v1
+      uses: actions/cache@v2
       with:
         path: ./.meteor/local
         key: ${{ runner.OS }}-meteor_cache-${{ hashFiles('.meteor/versions') }}-${{ hashFiles('.github/workflows/build_and_test.yml') }}
 
     - name: Cache meteor
-      uses: actions/cache@v1
+      uses: actions/cache@v2
       with:
         path: ~/.meteor
         key: ${{ runner.OS }}-meteor-${{ hashFiles('.meteor/release') }}-${{ hashFiles('.github/workflows/build_and_test.yml') }}
 
     - name: Use Node.js 12.18.4
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v2
       with:
         node-version: "12.18.4"
 
@@ -331,7 +344,6 @@ jobs:
         meteor npm --versions
         meteor node -v
         git version
-        echo $GITHUB_REF
 
     - name: npm install
       if: steps.cache-nodemodules.outputs.cache-hit != 'true'
@@ -395,7 +407,7 @@ jobs:
         password: ${{ secrets.DOCKER_PASS }}
 
     - name: Restore build
-      uses: actions/download-artifact@v1
+      uses: actions/download-artifact@v2
       with:
         name: build
         path: /tmp/build
@@ -421,22 +433,22 @@ jobs:
       if: github.event_name == 'release'
       run: |
         cd /tmp/build
-        CIRCLE_TAG="${GITHUB_REF#*tags/}"
+        GIT_TAG="${GITHUB_REF#*tags/}"
 
         if [[ '${{ matrix.release }}' = 'preview' ]]; then
           IMAGE="${IMAGE}.preview"
         fi;
 
-        docker build -t ${IMAGE}:$CIRCLE_TAG .
-        docker push ${IMAGE}:$CIRCLE_TAG
+        docker build -t ${IMAGE}:$GIT_TAG .
+        docker push ${IMAGE}:$GIT_TAG
 
-        if echo "$CIRCLE_TAG" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+$' ; then
+        if echo "$GIT_TAG" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+$' ; then
           RELEASE="latest"
-        elif echo "$CIRCLE_TAG" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$' ; then
+        elif echo "$GIT_TAG" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$' ; then
           RELEASE="release-candidate"
         fi
 
-        docker tag ${IMAGE}:$CIRCLE_TAG ${IMAGE}:${RELEASE}
+        docker tag ${IMAGE}:$GIT_TAG ${IMAGE}:${RELEASE}
         docker push ${IMAGE}:${RELEASE}
 
     - name: Build Docker image for develop

diff --git a/.snapcraft/resources/prepareRocketChat b/.snapcraft/resources/prepareRocketChat
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-curl -SLf "https://releases.rocket.chat/3.8.8/download/" -o rocket.chat.tgz
+curl -SLf "https://releases.rocket.chat/3.8.9/download/" -o rocket.chat.tgz
 
 tar xf rocket.chat.tgz --strip 1
 

diff --git a/.snapcraft/snap/snapcraft.yaml b/.snapcraft/snap/snapcraft.yaml
@@ -7,7 +7,7 @@
 # 5.  `snapcraft snap`
 
 name: rocketchat-server
-version: 3.8.8
+version: 3.8.9
 summary: Rocket.Chat server
 description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/
 confinement: strict