From 10d6ba9fc77f03b90c88d650bf430f1b8bdafc9b Mon Sep 17 00:00:00 2001
From: Craig Colegrove <craig.colegrove@ironcorelabs.com>
Date: Wed, 27 May 2026 13:03:01 -0700
Subject: [PATCH 1/2] Remove yarn set version berry from typescript-ci

---
 .github/workflows/typescript-ci.yaml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/typescript-ci.yaml b/.github/workflows/typescript-ci.yaml
index 428a10d..836b65b 100644
--- a/.github/workflows/typescript-ci.yaml
+++ b/.github/workflows/typescript-ci.yaml
@@ -27,7 +27,7 @@ on:
       test_matrix_node_version:
         description: 'A JS array list of versions to be included in the test matrix. Defaults to "["14"]".'
         required: false
-        default: '["14"]'
+        default: '["24"]'
         type: string
       additional_system_deps:
         description: 'A single string of additional dependencies to install on the ubuntu runner using `apt`, ex "protobuf-compiler openssl".'
@@ -55,7 +55,7 @@ on:
         default: ""
       modern_yarn:
         type: boolean
-        description: 'Use Modern Yarn (v2+). If false use Classic (v1.x).'
+        description: "Use Modern Yarn (v2+). If false use Classic (v1.x)."
         required: false
         default: false
     secrets:
@@ -116,7 +116,6 @@ jobs:
         if: ${{ inputs.modern_yarn }}
         run: |
           corepack enable
-          yarn set version berry
       - name: Install modules
         run: yarn
       - name: Run tests

From 6ebb3baf322356f24dc1782133cdf7a3b29d6304 Mon Sep 17 00:00:00 2001
From: Craig Colegrove <craig.colegrove@ironcorelabs.com>
Date: Wed, 27 May 2026 13:17:17 -0700
Subject: [PATCH 2/2] Rearrange steps

---
 .github/workflows/typescript-ci.yaml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/typescript-ci.yaml b/.github/workflows/typescript-ci.yaml
index 836b65b..2b96317 100644
--- a/.github/workflows/typescript-ci.yaml
+++ b/.github/workflows/typescript-ci.yaml
@@ -102,6 +102,9 @@ jobs:
           keys: ${{ secrets.IRONHIDE_KEYS }}
           input: ${{ inputs.files_to_decrypt }}
           working-directory: ${{ env.UNDER_TEST_FOLDER }}
+      - name: Set yarn mode
+        if: ${{ inputs.modern_yarn }}
+        run: corepack enable
       - uses: actions/setup-node@v6
         with:
           node-version: ${{ matrix.node_version }}
@@ -112,10 +115,6 @@ jobs:
         run: |
           sudo apt update
           sudo apt install ${{ inputs.additional_system_deps }}
-      - name: Set yarn mode
-        if: ${{ inputs.modern_yarn }}
-        run: |
-          corepack enable
       - name: Install modules
         run: yarn
       - name: Run tests