From 41eb9e61f04efaf0be11bac75c0c98e92e9003d7 Mon Sep 17 00:00:00 2001
From: Hossein Mehrabi <ohyeaross@gmail.com>
Date: Tue, 10 Oct 2023 22:06:32 +0330
Subject: [PATCH] ci: fix workflows

---
 .github/workflows/canary-release.yml |  1 +
 .github/workflows/prerelease.yml     | 44 +++++++++++++++++-----------
 .github/workflows/release-pr.yml     |  4 +--
 3 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/canary-release.yml b/.github/workflows/canary-release.yml
index 2ab6e7d..e0e7d34 100644
--- a/.github/workflows/canary-release.yml
+++ b/.github/workflows/canary-release.yml
@@ -1,6 +1,7 @@
 name: Canary Release
 on:
   pull_request:
+
 concurrency:
   group: ${{ github.workflow }}
   cancel-in-progress: false
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index 9d7da80..b575c7e 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -3,18 +3,29 @@ on:
   push:
     branches:
       - 'main'
-concurrency:
-  group: ${{ github.workflow }}
-  cancel-in-progress: true
 
 jobs:
   prerelease:
+    concurrency:
+      group: ${{ github.workflow }}
+      cancel-in-progress: true
+
+    if: github.actor_id != vars.CI_BOT_ID && !contains(github.event.head_commit.message, format('chore{0} release', ':'))
     runs-on: ubuntu-latest
     steps:
+      - id: create_token
+        uses: tibdex/github-app-token@v2
+        with:
+          app_id: ${{ secrets.CI_APP_ID }}
+          private_key: ${{ secrets.CI_APP_PRIVATE_KEY }}
+          permissions: >-
+            { "contents": "write", "statuses": "write" }
+
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           fetch-tags: 1
+          token: ${{ steps.create_token.outputs.token }}
 
       - name: Extract version from lerna.json
         run: echo "value=$(jq .version lerna.json -r)" >> $GITHUB_OUTPUT
@@ -50,27 +61,26 @@ jobs:
         id: publish
         if: ${{ steps.changes.outputs.changed == 'true' }}
         run: |
-          git config --global user.name 'github-actions'
-          git config --global user.email 'github-actions@users.noreply.github.com'
+          git config --global user.name '${{ vars.CI_APP_NAME }}[bot]'
+          git config --global user.email '${{ vars.CI_BOT_ID }}+${{ vars.CI_APP_NAME }}[bot]@users.noreply.github.com'
           echo ".npmrc" >> .git/info/exclude
           echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > .npmrc
           yarn lerna version prerelease --no-private --conventional-commits --conventional-prerelease --preid=${{ steps.preid.outputs.value }} --yes
           yarn lerna publish from-git --summary-file=${{ runner.temp }} --yes
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ steps.create_token.outputs.token }}
 
-      - name: Run release-pr.yaml workflow
-        if: ${{ steps.changes.outputs.changed == 'true' }}
-        run: |
-          tag=$(git describe --tags $(git rev-list --tags --max-count=1))
-          echo "${{ runner.temp }}/lerna-publish-summary.json";
-          if [[ -f "${{ runner.temp }}/lerna-publish-summary.json" ]]; then
-            gh workflow run release-pr.yml --ref $tag;
-          fi;
-
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      # - name: Run release-pr.yaml workflow
+      #   if: ${{ steps.changes.outputs.changed == 'true' }}
+      #   run: |
+      #     tag=$(git describe --tags $(git rev-list --tags --max-count=1))
+      #     echo "${{ runner.temp }}/lerna-publish-summary.json";
+      #     if [[ -f "${{ runner.temp }}/lerna-publish-summary.json" ]]; then
+      #       gh workflow run release-pr.yml --ref $tag;
+      #     fi;
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Get release commit
         if: ${{ steps.changes.outputs.changed == 'true' }}
diff --git a/.github/workflows/release-pr.yml b/.github/workflows/release-pr.yml
index 2097a12..493b479 100644
--- a/.github/workflows/release-pr.yml
+++ b/.github/workflows/release-pr.yml
@@ -122,8 +122,8 @@ jobs:
 
       - uses: actions/github-script@v6
         id: pr
-        env: 
-            CHANGES: ${{ steps.bump.outputs.changes }}
+        env:
+          CHANGES: ${{ steps.bump.outputs.changes }}
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |