refactor: manually publish production releases from release branch only

Author: boblat

.github/workflows/gh-pages.yml

@@ -1,9 +1,9 @@
 name: 'Run typedoc and publish to pages'
 
 on:
-  push:
-    branches:
-      - main
+  workflow_call:
+  workflow_dispatch:
+
 jobs:
   build-and-publish-docs:
     runs-on: ubuntu-latest

.github/workflows/prod-release.yml

@@ -0,0 +1,44 @@
+name: Prod Publish
+
+on:
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+jobs:
+  prod_release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Generate bot token
+        uses: actions/create-github-app-token@v1
+        id: app_token
+        with:
+          app-id: ${{ secrets.BOT_ID }}
+          private-key: ${{ secrets.BOT_SK }}
+
+      - uses: actions/checkout@v4
+        with:
+          # Fetch entire repository history so we can determine version number from it
+          fetch-depth: 0
+          token: ${{ steps.app_token.outputs.token }}
+
+      - name: Set Git user as GitHub actions
+        run: git config --global user.email "179917785+engineering-ci[bot]@users.noreply.github.com" && git config --global user.name "engineering-ci[bot]"
+
+      - name: Merge main -> release
+        uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f
+        with:
+          type: now
+          from_branch: main
+          target_branch: release
+          github_token: ${{ steps.app_token.outputs.token }}
+
+      - name: Merge release -> main
+        uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f
+        with:
+          type: now
+          from_branch: release
+          target_branch: main
+          message: Merge release back to main to get version increment [no ci]
+          github_token: ${{ steps.app_token.outputs.token }}

.github/workflows/release.yml

@@ -7,6 +7,12 @@ on:
       - main
       - release
   workflow_dispatch:
+    inputs:
+      publish-prod-release:
+        description: "Publishing a production release? If false (default), won't create a production release."
+        type: boolean
+        required: false
+        default: false
 
 concurrency: release
 
@@ -15,6 +21,9 @@ permissions:
   issues: write
   pull-requests: write
 
+env:
+  PUBLISH_RELEASE: ${{ (github.ref_name != 'release' || inputs.publish-prod-release) && 'true' || 'false' }}
+
 jobs:
   build:
     name: 'Build @algorandfoundation/algorand-typescript-testing'
@@ -67,10 +76,21 @@ jobs:
           GITHUB_TOKEN: ${{ steps.app_token.outputs.token }}
 
       - name: Publish @algorandfoundation/algorand-typescript-testing
+        if: ${{ env.PUBLISH_RELEASE == 'true' }}
         uses: JS-DevTools/npm-publish@v3
         with:
           token: ${{ secrets.NPM_TOKEN }}
           package: artifacts/algo-ts-testing/package.json
           access: 'public'
           # Tagging 'main' branch with latest for now, even though it's beta because we don't have a non-beta
-          tag: ${{ github.ref_name == 'alpha' && 'alpha' || github.ref_name == 'main' && 'latest' || github.ref_name == 'release' && 'latest' || 'pre-release' }}
+          tag: ${{ github.ref_name == 'alpha' && 'alpha' || github.ref_name == 'main' && 'beta' || github.ref_name == 'release' && 'latest' || 'pre-release' }}
+
+  publish-docs:
+    name: Publish docs
+    needs: release
+    if: ${{ inputs.publish-prod-release }}
+    uses: ./.github/workflows/gh-pages.yml
+    permissions:
+      contents: read
+      pages: write
+      id-token: write