chore: update release workflow

kedrzu · Jan 22, 2025 · 9dd378b · 9dd378b
1 parent fb2b547
commit 9dd378b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/.github/workflows/update-yarn-lock.yml → .github/workflows/check-commit.yml b/.github/workflows/update-yarn-lock.yml → .github/workflows/check-commit.yml
@@ -1,27 +1,21 @@
-name: Update yarn.lock file
+name: Check commit
 on:
   push:
-    branches: [main]
+    branches: [main, release]
 jobs:
-  release:
+  check-commit:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
           node-version: latest
 
-      - name: Setup Git
-        run: |
-          git config --local user.email "actions@github.com"
-          git config --local user.name "Github Actions"
-
       - run: yarn install
         env:
           YARN_ENABLE_IMMUTABLE_INSTALLS: false
 
-      - name: Check for changes
-        id: check_changes
+      - name: Commit yarn.lock changes
         run: |
           if git diff --exit-code; then
             echo "No changes to commit."
@@ -31,3 +25,9 @@ jobs:
             git commit -a -m "chore: update yarn.lock"
             git push
           fi
+
+      - name: Build
+        run: yarn turbo run build
+
+      - name: Test
+        run: yarn test
diff --git a/.github/workflows/release-npm.yml b/.github/workflows/release-npm.yml
@@ -51,3 +51,14 @@ jobs:
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: actions/checkout@v4
+        if: ${{ inputs.dry_run != true }}
+        with:
+          ref: main
+
+      - name: Merge release to main
+        if: ${{ inputs.dry_run != true }}
+        run: |
+          git merge --no-ff release -m "chore: auto-merge release -> main"
+          git push