update merge branch action version

Author: boblat

.github/workflows/prod-release.yml

@@ -27,19 +27,18 @@ jobs:
         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
+        uses: devmasx/merge-branch@6ec8363d74aad4f1615d1234ae1908b4185c4313
         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
+        uses: devmasx/merge-branch@6ec8363d74aad4f1615d1234ae1908b4185c4313
         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 }}
-        env:
-          INPUT_MESSAGE: 'Merge release back to main to get version increment [no ci]'

.github/workflows/release.yml.orig

@@ -0,0 +1,97 @@
+name: Publish
+
+on:
+  push:
+    branches:
+      - alpha
+      - main
+      - release
+  workflow_dispatch:
+
+concurrency: release
+
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+
+jobs:
+  build:
+    name: 'Build @algorandfoundation/algorand-typescript-testing'
+    uses: ./.github/workflows/node-ci.yml
+    with:
+      pre-test-script: |
+        pipx install algokit
+        algokit localnet reset --update
+        pipx install puyapy
+      node-version: 22.x
+      run-build: true
+      run-commit-lint: true
+      audit-script: npm run audit
+      upload-artifact-name: algo-ts-testing
+      upload-artifact-path: ./dist
+
+  release:
+    name: Release
+    needs: build
+    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 }}
+
+      - name: Clone repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ steps.app_token.outputs.token }}
+
+      - name: Use Node.js 22.x
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22.x
+
+      - run: npm ci --ignore-scripts
+
+      - name: Download package artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: artifacts
+
+      - name: Generate semantic version for @algorandfoundation/algorand-typescript-testing
+        if: github.ref_name != 'main'
+        run: npx semantic-release
+        env:
+          GITHUB_TOKEN: ${{ steps.app_token.outputs.token }}
+
+<<<<<<< HEAD
+      # - name: Publish @algorandfoundation/algorand-typescript-testing
+      #   if: github.ref_name != 'main'
+      #   uses: JS-DevTools/npm-publish@v3
+      #   with:
+      #     token: ${{ secrets.NPM_TOKEN }}
+      #     package: artifacts/algo-ts-testing/package.json
+      #     access: 'public'
+      #     tag: ${{ github.ref_name == 'alpha' && 'alpha' || github.ref_name == 'main' && 'beta' || github.ref_name == 'release' && 'latest' || 'pre-release' }}
+=======
+      - name: Publish @algorandfoundation/algorand-typescript-testing
+        uses: JS-DevTools/npm-publish@v3
+        with:
+          token: ${{ secrets.NPM_TOKEN }}
+          package: artifacts/algo-ts-testing/package.json
+          access: 'public'
+          tag: ${{ github.ref_name == 'alpha' && 'alpha' || github.ref_name == 'main' && 'beta' || github.ref_name == 'release' && 'latest' || 'pre-release' }}
+>>>>>>> 98ff4b5 (build: uncomment release steps to publish production version)
+
+  publish-docs:
+    name: Publish docs
+    needs: release
+    if: github.ref_name == 'release'
+    uses: ./.github/workflows/gh-pages.yml
+    permissions:
+      contents: read
+      pages: write
+      id-token: write