fix: downgrade element to 1.11.55

superhero-com · Apr 15, 2024 · 703d864 · 703d864
1 parent 365af17
commit 703d864
Show file tree

Hide file tree

Showing 16 changed files with 3,994 additions and 3,339 deletions.
diff --git a/.github/workflows/build_debian.yaml b/.github/workflows/build_debian.yaml
@@ -62,7 +62,7 @@ jobs:
                   dpkg-gencontrol -v"$VERSION" -ldebian/tmp/DEBIAN/changelog
                   dpkg-deb -Zxz --root-owner-group --build debian/tmp element-web.deb
 
-            - uses: actions/upload-artifact@v4
+            - uses: actions/upload-artifact@v3
               with:
                   name: element-web.deb
                   path: element-web.deb

diff --git a/.github/workflows/build_develop.yml b/.github/workflows/build_develop.yml
@@ -47,7 +47,7 @@ jobs:
 
             - run: mv dist/element-*.tar.gz dist/develop.tar.gz
 
-            - uses: actions/upload-artifact@v4
+            - uses: actions/upload-artifact@v3
               with:
                   name: webapp
                   path: dist/develop.tar.gz
@@ -98,7 +98,7 @@ jobs:
                   running-workflow-name: "Build & Deploy develop.element.io"
                   repo-token: ${{ secrets.GITHUB_TOKEN }}
                   wait-interval: 10
-                  check-regexp: ^((?!SonarCloud|SonarQube|issue|board|label|Release|prepare).)*$
+                  check-regexp: ^((?!SonarCloud|SonarQube|issue|board|label|Release).)*$
 
             # We keep the latest develop.tar.gz on R2 instead of relying on the github artifact uploaded earlier
             # as the expires after 24h and requires auth to download.

diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml
@@ -46,7 +46,7 @@ jobs:
 
             - name: Docker meta
               id: meta
-              uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5
+              uses: docker/metadata-action@31cebacef4805868f9ce9a0cb03ee36c32df2ac4 # v5
               with:
                   images: |
                       superherodotcom/element-web
@@ -68,7 +68,7 @@ jobs:
 
             - name: Update repo description
               if: matrix.variant == 'vanilla'
-              uses: peter-evans/dockerhub-description@e98e4d1628a5f3be2be7c231e50981aee98723ae # v4
+              uses: peter-evans/dockerhub-description@dc67fad7001ef9e8e3c124cb7a64e16d0a63d864 # v4
               continue-on-error: true
               with:
                   username: ${{ secrets.DOCKERHUB_USERNAME }}

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -101,7 +101,7 @@ jobs:
               run: mdbook build
 
             - name: Upload artifact
-              uses: actions/upload-pages-artifact@v3
+              uses: actions/upload-pages-artifact@v2
               with:
                   path: ./book
 
@@ -114,4 +114,4 @@ jobs:
         steps:
             - name: Deploy to GitHub Pages
               id: deployment
-              uses: actions/deploy-pages@v4
+              uses: actions/deploy-pages@v3
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
@@ -2,10 +2,20 @@ name: Release Drafter
 on:
     push:
         branches: [staging]
-    workflow_dispatch: {}
+    workflow_dispatch:
+        inputs:
+            previous-version:
+                description: What release to use as a base for release note purposes
+                required: false
+                type: string
 concurrency: ${{ github.workflow }}
 jobs:
     draft:
-        uses: matrix-org/matrix-js-sdk/.github/workflows/release-drafter-workflow.yml@develop
-        with:
-            include-changes: matrix-react-sdk
+        runs-on: ubuntu-latest
+        steps:
+            - uses: release-drafter/release-drafter@e64b19c4c46173209ed9f2e5a2f4ca7de89a0e86 # v5
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              with:
+                  disable-autolabeler: true
+                  previous-version: ${{ inputs.previous-version }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,6 +10,16 @@ on:
                 options:
                     - rc
                     - final
+            matrix-react-sdk:
+                description: React SDK version to use (current|X.Y.Z)
+                required: false
+                default: current
+                type: string
+            matrix-js-sdk:
+                description: JS SDK version to use (current|X.Y.Z)
+                required: false
+                default: current
+                type: string
 concurrency: ${{ github.workflow }}
 jobs:
     release:
@@ -24,38 +34,6 @@ jobs:
             gpg-fingerprint: ${{ vars.GPG_FINGERPRINT }}
             asset-path: dist/*.tar.gz
             expected-asset-count: 3
-
-    notify-downstream:
-        name: Trigger release drafter downstream
-        needs: release
-        runs-on: ubuntu-latest
-        steps:
-            - name: Notify element-desktop repo that element-web release has completed to re-trigger release-drafter
-              uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # v3
-              with:
-                  token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  repository: element-hq/element-desktop
-                  event-type: upstream-release-notify
-
-    check:
-        name: Post release checks
-        needs: release
-        runs-on: ubuntu-latest
-        steps:
-            - name: Wait for dockerhub
-              uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork
-              with:
-                  ref: master
-                  repo-token: ${{ secrets.GITHUB_TOKEN }}
-                  wait-interval: 10
-                  check-name: "Docker Buildx (vanilla)"
-                  allowed-conclusions: success
-
-            - name: Wait for debian package
-              uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork
-              with:
-                  ref: master
-                  repo-token: ${{ secrets.GITHUB_TOKEN }}
-                  wait-interval: 10
-                  check-name: Build package
-                  allowed-conclusions: success
+            dependencies: |
+                matrix-react-sdk=${{ inputs.matrix-react-sdk }}
+                matrix-js-sdk=${{ inputs.matrix-js-sdk }}
diff --git a/.github/workflows/release_prepare.yml b/.github/workflows/release_prepare.yml
@@ -25,9 +25,6 @@ on:
 jobs:
     prepare:
         runs-on: ubuntu-latest
-        env:
-            # The order is specified bottom-up to avoid any races for allchange
-            REPOS: matrix-js-sdk matrix-react-sdk element-web element-desktop
         steps:
             - name: Checkout Element Desktop
               uses: actions/checkout@v4
@@ -70,55 +67,14 @@ jobs:
                   fetch-tags: true
                   token: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
+            - name: Resolve repos
+              run: |
+                  echo "REPOS=$(ls . | tr '\n' ' ')" >> $GITHUB_ENV
             - name: Merge develop
               run: |
-                  git config --global user.email "[email protected]"
-                  git config --global user.name "RiotRobot"
-                  for REPO in $REPOS; do [ -d "$REPO" ] && git -C "$REPO" merge origin/develop; done
+                git config --global user.email "[email protected]"
+                git config --global user.name "RiotRobot"
+                for REPO in $REPOS; do git -C "$REPO" merge origin/develop; done
 
             - name: Push staging
-              run: for REPO in $REPOS; do [ -d "$REPO" ] && git -C "$REPO" push origin staging; done
-
-            - name: Wait for matrix-js-sdk draft
-              if: inputs.matrix-js-sdk
-              uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork
-              with:
-                  ref: staging
-                  repo: matrix-org/matrix-js-sdk
-                  repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  wait-interval: 10
-                  check-name: draft
-                  allowed-conclusions: success
-
-            - name: Wait for matrix-react-sdk draft
-              if: inputs.matrix-react-sdk
-              uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork
-              with:
-                  ref: staging
-                  repo: matrix-org/matrix-react-sdk
-                  repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  wait-interval: 10
-                  check-name: draft
-                  allowed-conclusions: success
-
-            - name: Wait for element-web draft
-              if: inputs.element-web
-              uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork
-              with:
-                  ref: staging
-                  repo: element-hq/element-web
-                  repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  wait-interval: 10
-                  check-name: draft
-                  allowed-conclusions: success
-
-            - name: Wait for element-desktop draft
-              if: inputs.element-desktop
-              uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork
-              with:
-                  ref: staging
-                  repo: element-hq/element-desktop
-                  repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  wait-interval: 10
-                  check-name: draft
-                  allowed-conclusions: success
+              run: for REPO in $REPOS; do git -C "$REPO" push origin staging; done
diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
@@ -14,4 +14,3 @@ jobs:
         uses: matrix-org/matrix-js-sdk/.github/workflows/sonarcloud.yml@develop
         secrets:
             SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-            ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -35,25 +35,9 @@ jobs:
               run: "yarn coverage --ci --max-workers ${{ steps.cpu-cores.outputs.count }}"
 
             - name: Upload Artifact
-              uses: actions/upload-artifact@v4
+              uses: actions/upload-artifact@v3
               with:
                   name: coverage
                   path: |
                       coverage
                       !coverage/lcov-report
-
-    skip_sonar:
-        name: Skip SonarCloud in merge queue
-        if: github.event_name == 'merge_group'
-        runs-on: ubuntu-latest
-        needs: jest
-        steps:
-            - name: Skip SonarCloud
-              uses: Sibz/github-status-action@071b5370da85afbb16637d6eed8524a06bc2053e # v1
-              with:
-                  authToken: ${{ secrets.GITHUB_TOKEN }}
-                  state: success
-                  description: SonarCloud skipped
-                  context: SonarCloud Code Analysis
-                  sha: ${{ github.sha }}
-                  target_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}