Chore: Update yarn to 4.9.1 and refactor CI

.github/actions/node-setup/action.yml

@@ -22,13 +22,18 @@ runs:
     - uses: actions/cache@v4
       id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
       with:
-        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+        path: |
+          ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          .yarn/unplugged
+          .yarn/build-state.yml
+          .yarn/install-state.gz
         key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
         restore-keys: |
           ${{ runner.os }}-yarn-
 
     - name: Package Install
       run: |
+        yarn config set winLinkType symlinks
         if [ "${{ inputs.strict }}" = "true" ]; then
           yarn install --immutable --check-resolutions --refresh-lockfile
           yarn constraints

.github/workflows/ci.yml

@@ -32,11 +32,6 @@ jobs:
       - name: Setup
         uses: ./.github/actions/node-setup
 
-      - name: More setup cache
-        uses: ./.github/actions/cache-dir
-        with:
-          key: checker
-
       - name: Typechecker
         run: yarn build:type
 

.github/workflows/fast-forward.yml

@@ -24,13 +24,13 @@ jobs:
           COMMENT_BODY: ${{ github.event.comment.body }}
         run: |
           if [[ "$COMMENT_BODY" =~ (^|[[:space:]])/fast-forward($|[[:space:]]) ]]; then
-            echo "MATCH=true" >> $GITHUB_ENV
+            echo "MATCH=true" >> $GITHUB_OUTPUT
           else
-            echo "MATCH=false" >> $GITHUB_ENV
+            echo "MATCH=false" >> $GITHUB_OUTPUT
           fi
 
       - name: Fast forwarding
-        if: env.MATCH == 'true'
+        if: ${{ steps.check_comment.outputs.MATCH == 'true' }}
         uses: sequoia-pgp/fast-forward@v1
         with:
           merge: true
@@ -41,7 +41,7 @@ jobs:
           comment: always
 
       - name: Check target branch
-        if: env.MATCH == 'true'
+        if: ${{ steps.check_comment.outputs.MATCH == 'true' }}
         id: check_branch
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -113,11 +113,21 @@ jobs:
       statuses: write
 
     steps:
+      - name: Get PR Branch
+        id: get_pr_branch
+        run: |
+          PR_NUMBER=${{ github.event.issue.number }}
+          PR_BRANCH=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+                      "https://api.github.com/repos/${{ github.repository }}/pulls/$PR_NUMBER" \
+                      | jq -r .head.ref)
+
+          echo "branch=$PR_BRANCH" >> $GITHUB_OUTPUT
+
       - name: Checkout Repo
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          ref: main
+          ref: ${{ steps.get_pr_branch.outputs.branch }}
 
       - name: Setup
         uses: ./.github/actions/node-setup

.github/workflows/rebase.yml

@@ -22,25 +22,25 @@ jobs:
           COMMENT_BODY: ${{ github.event.comment.body }}
         run: |
           if [[ "$COMMENT_BODY" =~ (^|[[:space:]])/rebase($|[[:space:]]) ]]; then
-            echo "MATCH=true" >> $GITHUB_ENV
+            echo "MATCH=true" >> $GITHUB_OUTPUT
           else
-            echo "MATCH=false" >> $GITHUB_ENV
+            echo "MATCH=false" >> $GITHUB_OUTPUT
           fi
 
       - name: Checkout repository
-        if: env.MATCH == 'true'
+        if: ${{ steps.check_comment.outputs.MATCH == 'true' }}
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Install git-branchless
-        if: env.MATCH == 'true'
+        if: ${{ steps.check_comment.outputs.MATCH == 'true' }}
         run: |
           brew install --no-quarantine git-branchless
           git-branchless init
 
       - name: Rebase PR
-        if: env.MATCH == 'true'
+        if: ${{ steps.check_comment.outputs.MATCH == 'true' }}
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"

.yarnrc.yml

@@ -8,12 +8,14 @@ enableGlobalCache: true
 
 enableHardenedMode: false
 
-globalFolder: ./.yarn/cache
+globalFolder: ./.yarn/cache/global
 
 nodeLinker: pnpm
 
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
     spec: "https://mskelton.dev/yarn-outdated/v3"
 
-yarnPath: .yarn/releases/yarn-4.6.0.cjs
+pnpmStoreFolder: ./.yarn/cache/.store
+
+yarnPath: .yarn/releases/yarn-4.9.1.cjs

package.json

@@ -2,7 +2,7 @@
   "name": "mincho",
   "type": "module",
   "private": true,
-  "packageManager": "yarn@4.6.0",
+  "packageManager": "yarn@4.9.1",
   "workspaces": [
     "configs/*",
     "packages/*",