Merge pull request #30457 from RocketChat/release-6.3.8

Release 6.3.8
RocketChat · Sep 26, 2023 · 276c771 · 276c771
2 parents c4bcbb2 + ef982c2
commit 276c771
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 51 deletions.
diff --git a/.changeset/bump-patch-1695309507614.md b/.changeset/bump-patch-1695309507614.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Bump @rocket.chat/meteor version.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -323,13 +323,16 @@ jobs:
           echo finished
 
   deploy:
-    name: 🚀 Publish build and update our registry
+    name: 🚀 Publish build assets
     runs-on: ubuntu-20.04
     if: github.event_name == 'release' || github.ref == 'refs/heads/develop'
     needs: [tests-done, release-versions]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: Bhacaz/checkout-files@v2
+        with:
+          files: package.json
+          branch: ${{ github.ref }}
 
       - name: Restore build
         uses: actions/download-artifact@v3
@@ -343,32 +346,17 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: 'us-east-1'
           GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
-          REDHAT_REGISTRY_PID: ${{ secrets.REDHAT_REGISTRY_PID }}
-          REDHAT_REGISTRY_KEY: ${{ secrets.REDHAT_REGISTRY_KEY }}
-          UPDATE_TOKEN: ${{ secrets.UPDATE_TOKEN }}
         run: |
           REPO_VERSION=$(node -p "require('./package.json').version")
+
           if [[ '${{ github.event_name }}' = 'release' ]]; then
             GIT_TAG="${GITHUB_REF#*tags/}"
-            GIT_BRANCH=""
             ARTIFACT_NAME="${REPO_VERSION}"
-            RC_VERSION=$GIT_TAG
-
-            if [[ '${{ needs.release-versions.outputs.release }}' = 'release-candidate' ]]; then
-              SNAP_CHANNEL=candidate
-              RC_RELEASE=candidate
-            elif [[ '${{ needs.release-versions.outputs.release }}' = 'latest' ]]; then
-              SNAP_CHANNEL=stable
-              RC_RELEASE=stable
-            fi
           else
             GIT_TAG=""
-            GIT_BRANCH="${GITHUB_REF#*heads/}"
             ARTIFACT_NAME="${REPO_VERSION}.$GITHUB_SHA"
-            RC_VERSION="${REPO_VERSION}"
-            SNAP_CHANNEL=edge
-            RC_RELEASE=develop
           fi;
+
           ROCKET_DEPLOY_DIR="/tmp/deploy"
           FILENAME="$ROCKET_DEPLOY_DIR/rocket.chat-$ARTIFACT_NAME.tgz";
 
@@ -386,22 +374,6 @@ 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\": \"${{ needs.release-versions.outputs.node-version }}\", \"compatibleMongoVersions\": [\"4.4\", \"5.0\", \"6.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
-          curl --fail https://releases.rocket.chat/$RC_VERSION/info
-
-          if [[ $GIT_TAG ]]; then
-            curl -X POST \
-              https://connect.redhat.com/api/v2/projects/$REDHAT_REGISTRY_PID/build \
-              -H "Authorization: Bearer $REDHAT_REGISTRY_KEY" \
-              -H 'Cache-Control: no-cache' \
-              -H 'Content-Type: application/json' \
-              -d '{"tag":"'$GIT_TAG'"}'
-          fi
-
   build-docker-preview:
     name: 🚢 Build Docker Image (preview)
     runs-on: ubuntu-20.04
@@ -632,6 +604,66 @@ jobs:
 
           echo "::endgroup::"
 
+  notify-services:
+    name: 🚀 Notify external services
+    runs-on: ubuntu-20.04
+    needs:
+      - services-docker-image-publish
+      - docker-image-publish
+      - release-versions
+    steps:
+      - uses: Bhacaz/checkout-files@v2
+        with:
+          files: package.json
+          branch: ${{ github.ref }}
+
+      - name: Releases service
+        env:
+          UPDATE_TOKEN: ${{ secrets.UPDATE_TOKEN }}
+        run: |
+          REPO_VERSION=$(node -p "require('./package.json').version")
+
+          if [[ '${{ github.event_name }}' = 'release' ]]; then
+            GIT_TAG="${GITHUB_REF#*tags/}"
+            GIT_BRANCH=""
+            ARTIFACT_NAME="${REPO_VERSION}"
+            RC_VERSION=$GIT_TAG
+
+            if [[ '${{ needs.release-versions.outputs.release }}' = 'release-candidate' ]]; then
+              RC_RELEASE=candidate
+            elif [[ '${{ needs.release-versions.outputs.release }}' = 'latest' ]]; then
+              RC_RELEASE=stable
+            fi
+          else
+            GIT_TAG=""
+            GIT_BRANCH="${GITHUB_REF#*heads/}"
+            ARTIFACT_NAME="${REPO_VERSION}.$GITHUB_SHA"
+            RC_VERSION="${REPO_VERSION}"
+            RC_RELEASE=develop
+          fi;
+
+          curl -H "Content-Type: application/json" -H "X-Update-Token: $UPDATE_TOKEN" -d \
+              "{\"nodeVersion\": \"${{ needs.release-versions.outputs.node-version }}\", \"compatibleMongoVersions\": [\"4.4\", \"5.0\", \"6.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
+          curl --fail https://releases.rocket.chat/$RC_VERSION/info
+
+      - name: RedHat Registry
+        if: github.event_name == 'release'
+        env:
+          REDHAT_REGISTRY_PID: ${{ secrets.REDHAT_REGISTRY_PID }}
+          REDHAT_REGISTRY_KEY: ${{ secrets.REDHAT_REGISTRY_KEY }}
+        run: |
+          GIT_TAG="${GITHUB_REF#*tags/}"
+
+          curl -X POST \
+            https://connect.redhat.com/api/v2/projects/$REDHAT_REGISTRY_PID/build \
+            -H "Authorization: Bearer $REDHAT_REGISTRY_KEY" \
+            -H 'Cache-Control: no-cache' \
+            -H 'Content-Type: application/json' \
+            -d '{"tag":"'$GIT_TAG'"}'
+
   trigger-dependent-workflows:
     runs-on: ubuntu-latest
     if: github.event_name == 'release'

diff --git a/apps/meteor/.meteor/packages b/apps/meteor/.meteor/packages
@@ -25,7 +25,7 @@ [email protected]
 [email protected]
 
 pauli:accounts-linkedin
-[email protected].3
+[email protected].4
 [email protected]
 [email protected]
 
@@ -39,7 +39,7 @@ [email protected]
 [email protected]
 [email protected]
 
-[email protected].6
+[email protected].7
 
 [email protected]
 [email protected]

diff --git a/apps/meteor/.meteor/release b/apps/meteor/.meteor/release
@@ -1 +1 @@
-METEOR@2.12
+METEOR@2.13.3
diff --git a/apps/meteor/.meteor/versions b/apps/meteor/.meteor/versions
@@ -22,7 +22,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].1
+[email protected].2
 [email protected]
 dispatch:[email protected]
 [email protected]
@@ -38,7 +38,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].3
+[email protected].4
 [email protected]
 [email protected]
 [email protected]
@@ -47,7 +47,7 @@ [email protected]
 kadira:[email protected]
 [email protected]
 [email protected]
-[email protected].2
+[email protected].3
 [email protected]
 [email protected]
 meteorhacks:[email protected]
@@ -57,7 +57,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].6
+[email protected].7
 [email protected]
 [email protected]
 [email protected]
@@ -94,7 +94,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].2
+[email protected].3
 [email protected]
 [email protected]
 [email protected]

diff --git a/yarn.lock b/yarn.lock
@@ -9898,9 +9898,9 @@ __metadata:
     "@rocket.chat/icons": "*"
     "@rocket.chat/prettier-config": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-contexts": 1.0.6
+    "@rocket.chat/ui-contexts": 1.0.7
     "@rocket.chat/ui-kit": "*"
-    "@rocket.chat/ui-video-conf": 1.0.6
+    "@rocket.chat/ui-video-conf": 1.0.7
     "@tanstack/react-query": "*"
     react: "*"
     react-dom: "*"
@@ -9982,14 +9982,14 @@ __metadata:
     ts-jest: ~29.0.5
     typescript: ~5.1.3
   peerDependencies:
-    "@rocket.chat/core-typings": 6.3.6
+    "@rocket.chat/core-typings": 6.3.7
     "@rocket.chat/css-in-js": "*"
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-tokens": "*"
     "@rocket.chat/message-parser": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-client": 1.0.6
-    "@rocket.chat/ui-contexts": 1.0.6
+    "@rocket.chat/ui-client": 1.0.7
+    "@rocket.chat/ui-contexts": 1.0.7
     katex: "*"
     react: "*"
   languageName: unknown
@@ -11048,7 +11048,7 @@ __metadata:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
-    "@rocket.chat/ui-contexts": 1.0.6
+    "@rocket.chat/ui-contexts": 1.0.7
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -11202,7 +11202,7 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-contexts": 1.0.6
+    "@rocket.chat/ui-contexts": 1.0.7
     react: ^17.0.2
     react-dom: ^17.0.2
   languageName: unknown
@@ -11268,7 +11268,7 @@ __metadata:
     typescript: ~5.1.3
   peerDependencies:
     "@rocket.chat/layout": "*"
-    "@rocket.chat/ui-contexts": 1.0.6
+    "@rocket.chat/ui-contexts": 1.0.7
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"