Merge branch 'main' into next

.github/actions/release-alpha/action.yml

@@ -10,12 +10,6 @@ inputs:
 runs:
   using: 'composite'
   steps:
-    - name: Configure git user
-      run: |
-        git config --local user.email "[email protected]"
-        git config --local user.name "empathy/x"
-      shell: bash
-
     - name: Configure npm auth
       run: |
         npm config set registry="https://registry.npmjs.org/"
@@ -33,6 +27,5 @@ runs:
     - name: Push tags
       uses: ad-m/github-push-action@master
       with:
-        github_token: ${{ inputs.github_token }}
         branch: ${{ github.ref }}
         tags: true

.github/workflows/build.yml

@@ -8,18 +8,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      # Use GitHub App token as a workaround to allow bypassing branch-protection rules
-      # https://github.com/orgs/community/discussions/13836#discussioncomment-8535364
-      - uses: actions/create-github-app-token@v1
-        id: app-token
-        with:
-          app-id: ${{ vars.GH_TOKENS_APP_ID }}
-          private-key: ${{ secrets.GH_TOKENS_APP_PRIVATE_KEY }}
-
       - name: checkout repository
         uses: actions/checkout@v4
         with:
-          token: ${{ steps.app-token.outputs.token }}
           fetch-depth: 0
 
       - name: Install
@@ -42,4 +33,3 @@ jobs:
         uses: ./.github/actions/release-alpha
         with:
           npm_token: ${{ secrets.NPM_TOKEN_GRANULAR_ACCESS }}
-          github_token: ${{ steps.app-token.outputs.token }}

.github/workflows/release-alpha.yml

@@ -1,5 +1,11 @@
 name: Release alpha version on demand
-on: [workflow_dispatch]
+on:
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: 'Branch to release from'
+        required: true
+        default: 'main'
 jobs:
   release-alpha:
     runs-on: ubuntu-latest
@@ -35,5 +41,5 @@ jobs:
       - name: execute release-alpha action
         uses: ./.github/actions/release-alpha
         with:
-          npm_token: ${{ secrets.NPM_TOKEN_GRANULAR_ACCESS }}
+          npm_token: ${{ secrets.NPM_TOKEN }}
           github_token: ${{ steps.app-token.outputs.token }}