Merge branch 'master' into develop

.github/actions/download-verify-element-tarball/action.yml

@@ -10,24 +10,30 @@ inputs:
 runs:
     using: composite
     steps:
-        - name: Download current version for its old bundles
+        - name: Download release tarball
           id: current_download
           uses: robinraju/release-downloader@a96f54c1b5f5e09e47d9504526e96febd949d4c2 # v1
           with:
-              tag: steps.current_version.outputs.version
+              tag: ${{ inputs.tag }}
               fileName: element-*.tar.gz*
               out-file-path: ${{ runner.temp }}/download-verify-element-tarball
 
         - name: Verify tarball
+          shell: bash
           run: gpg --verify element-*.tar.gz.asc element-*.tar.gz
           working-directory: ${{ runner.temp }}/download-verify-element-tarball
 
         - name: Extract tarball
-          run: tar xvzf element-*.tar.gz -C webapp --strip-components=1
+          shell: bash
+          run: |
+              mkdir webapp
+              tar xvzf element-*.tar.gz -C webapp --strip-components=1
           working-directory: ${{ runner.temp }}/download-verify-element-tarball
 
         - name: Move webapp to out-file-path
+          shell: bash
           run: mv ${{ runner.temp }}/download-verify-element-tarball/webapp ${{ inputs.out-file-path }}
 
         - name: Clean up temp directory
+          shell: bash
           run: rm -R ${{ runner.temp }}/download-verify-element-tarball

.github/workflows/deploy.yml

@@ -1,7 +1,8 @@
 # Manual deploy workflow for deploying to app.element.io & staging.element.io
 # Runs automatically for staging.element.io when an RC or Release is published
 # Note: Does *NOT* run automatically for app.element.io so that it gets tested on staging.element.io beforehand
-name: Build and Deploy ${{ inputs.site || 'staging.element.io' }}
+name: Deploy release
+run-name: Deploy ${{ github.ref_name }} to ${{ inputs.site || 'staging.element.io' }}
 on:
     release:
         types: [published]
@@ -28,37 +29,39 @@ jobs:
         env:
             SITE: ${{ inputs.site || 'staging.element.io' }}
         steps:
+            - uses: actions/checkout@v4
+
             - name: Load GPG key
               run: |
                   curl https://packages.element.io/element-release-key.gpg | gpg --import
                   gpg -k "$GPG_FINGERPRINT"
               env:
-                  GPG_FINGERPRINT: ${{ secrets.GPG_FINGERPRINT }}
+                  GPG_FINGERPRINT: ${{ vars.GPG_FINGERPRINT }}
 
             - name: Check current version on deployment
               id: current_version
               run: |
-                  echo "version=$(curl -s https://$SITE/version)" >> $GITHUB_OUTPUT
+                  echo "version=v$(curl -s https://$SITE/version)" >> $GITHUB_OUTPUT
 
             # The current version bundle melding dance is skipped if the version we're deploying is the same
             # as then we're just doing a re-deploy of the same version with potentially different configs.
             - name: Download current version for its old bundles
               id: current_download
               if: steps.current_version.outputs.version != github.ref_name
-              uses: element-hq/element-web/.github/actions/download-verify-element-tarball@${{ github.ref_name }}
+              uses: ./.github/actions/download-verify-element-tarball
               with:
-                  tag: steps.current_version.outputs.version
-                  out-file-path: current_version
+                  tag: ${{ steps.current_version.outputs.version }}
+                  out-file-path: _current_version
 
             - name: Download target version
-              uses: element-hq/element-web/.github/actions/download-verify-element-tarball@${{ github.ref_name }}
+              uses: ./.github/actions/download-verify-element-tarball
               with:
                   tag: ${{ github.ref_name }}
                   out-file-path: _deploy
 
             - name: Merge current bundles into target
               if: steps.current_download.outcome == 'success'
-              run: cp -vnpr current_version/bundles/* _deploy/bundles/
+              run: cp -vnpr _current_version/bundles/* _deploy/bundles/
 
             - name: Copy config
               run: cp element.io/app/config.json _deploy/config.json
@@ -73,7 +76,7 @@ jobs:
               uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork
               with:
                   ref: ${{ github.sha }}
-                  running-workflow-name: "Build and Deploy ${{ env.SITE }}"
+                  running-workflow-name: "Deploy to Cloudflare Pages"
                   repo-token: ${{ secrets.GITHUB_TOKEN }}
                   wait-interval: 10
                   check-regexp: ^((?!SonarCloud|SonarQube|issue|board|label|Release|prepare|GitHub Pages).)*$