fix: setup node support macos 14 in arm64

follow webpack/webpack#18359
node-modules · May 8, 2024 · 93d491d · 93d491d
1 parent c68dde8
commit 93d491d
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 11 deletions.
diff --git a/.github/workflows/node-release.yml b/.github/workflows/node-release.yml
@@ -49,22 +49,22 @@ jobs:
     steps:
       # Checkout action repository
       - name: Checkout action repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: node-modules/github-actions
           path: action_repo
           ref: ${{ inputs.action_ref }}
 
       # Checkout project repository
       - name: Checkout project repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: main_repo
           token: ${{ secrets.GIT_TOKEN }}
 
       # Setup Node.js environment
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
 
       # Install action dependencies
       - name: Install action dependencies

diff --git a/.github/workflows/node-test-mysql.yml b/.github/workflows/node-test-mysql.yml
@@ -10,8 +10,8 @@ on:
 
       version:
         type: string
-        description: 'Node.js Version, such as 16, 18'
-        default: '16, 18'
+        description: 'Node.js Version, such as 16, 18, 20, 22'
+        default: '16, 18, 20, 22'
 
       install:
         type: string
@@ -39,15 +39,15 @@ jobs:
     steps:
       # Checkout action repository
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: node-modules/github-actions
           path: action_repo
           ref: ${{ inputs.action_ref }}
 
       # Setup Node.js environment
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
 
       # Install dependencies
       - name: Install dependencies
@@ -98,12 +98,29 @@ jobs:
 
     steps:
       - name: Checkout Git Source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
+      - name: Calculate Architecture
+        uses: actions/github-script@v7
+        with:
+          result-encoding: string
+          script: |
+            const osVersion = '${{ matrix.os }}';
+            const nodeVersion = '${{ matrix['node-version'] }}';
+            const isMacOS = osVersion === 'macos-latest' || osVersion.startsWith('macos');
+            const isMajor14 = nodeVersion === '14' || nodeVersion.startsWith('14.');
+            if (isMacOS && isMajor14) {
+              return 'x64';
+            } else {
+              return '';
+            }
 
       - name: Use Node.js ${{ matrix.version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.version }}
+          architecture: ${{ steps.calculate_architecture.outputs.result }}
+          check-latest: true
 
       - name: Install Dependencies
         run: ${{ inputs.install }}

diff --git a/.github/workflows/node-test.yml b/.github/workflows/node-test.yml
@@ -10,8 +10,8 @@ on:
 
       version:
         type: string
-        description: 'Node.js Version, such as 16, 18, 20'
-        default: '16, 18, 20'
+        description: 'Node.js Version, such as 16, 18, 20, 22'
+        default: '16, 18, 20, 22'
 
       install:
         type: string
@@ -75,10 +75,26 @@ jobs:
       - name: Checkout Git Source
         uses: actions/checkout@v4
 
+      - name: Calculate Architecture
+        uses: actions/github-script@v7
+        with:
+          result-encoding: string
+          script: |
+            const osVersion = '${{ matrix.os }}';
+            const nodeVersion = '${{ matrix['node-version'] }}';
+            const isMacOS = osVersion === 'macos-latest' || osVersion.startsWith('macos');
+            const isMajor14 = nodeVersion === '14' || nodeVersion.startsWith('14.');
+            if (isMacOS && isMajor14) {
+              return 'x64';
+            } else {
+              return '';
+            }
+
       - name: Use Node.js ${{ matrix.version }}
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.version }}
+          architecture: ${{ steps.calculate_architecture.outputs.result }}
           check-latest: true
 
       - name: Install Dependencies