Merge branch 'canary' into sam/github-workflow/bankrupt

vercel · Jun 10, 2024 · 1e43243 · 1e43243
2 parents 48454c4 + 4539e33
commit 1e43243
Show file tree

Hide file tree

Showing 72 changed files with 596 additions and 644 deletions.
diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
@@ -22,7 +22,7 @@ jobs:
       # canary next-swc binaries in the monorepo
       NEXT_SKIP_NATIVE_POSTINSTALL: 1
     outputs:
-      isRelease: ${{ github.event_name != 'workflow_dispatch' && steps.check-release.outputs.IS_RELEASE }}
+      isRelease: ${{ steps.check-release.outputs.IS_RELEASE }}
     steps:
       - name: Setup node
         uses: actions/setup-node@v4

diff --git a/.github/workflows/trigger_release.yml b/.github/workflows/trigger_release.yml
@@ -22,6 +22,11 @@ on:
           - minor
           - major
 
+      force:
+        description: create a new release even if there are no new commits
+        default: false
+        type: boolean
+
     secrets:
       RELEASE_BOT_GITHUB_TOKEN:
         required: true
@@ -66,7 +71,7 @@ jobs:
         run: echo "LATEST_COMMIT=$(git rev-parse HEAD)" >> $GITHUB_ENV
 
       - name: Check if new commits since last tag
-        if: ${{ github.event.inputs.releaseType != 'stable' }}
+        if: ${{ github.event.inputs.releaseType != 'stable' && github.event.inputs.force != true }}
         run: |
           if [ "$LATEST_TAG_COMMIT" = "$LATEST_COMMIT" ]; then
             echo "No new commits. Exiting..."