Merge remote-tracking branch 'origin/develop' into develop

element-hq · Nov 14, 2023 · e1b5c72 · e1b5c72
2 parents 651b6db + 1300a2b
commit e1b5c72
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/build_develop.yml b/.github/workflows/build_develop.yml
@@ -91,7 +91,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).)*$
+                  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/release-drafter.yml b/.github/workflows/release-drafter.yml
@@ -2,13 +2,20 @@ name: Release Drafter
 on:
     push:
         branches: [staging]
+    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:
         runs-on: ubuntu-latest
         steps:
-            - uses: release-drafter/release-drafter@dabcf3767562210392d862070ed2ef6434b9bc6f # v5
+            - uses: release-drafter/release-drafter@e64b19c4c46173209ed9f2e5a2f4ca7de89a0e86 # v5
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
               with:
                   disable-autolabeler: true
+                  previous-version: ${{ inputs.previous-version }}