Author: engineering-ci[bot]

.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

@@ -67,21 +67,21 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ steps.app_token.outputs.token }}
 
-      # - 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
+        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' }}
 
-  # 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
+  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