File tree Expand file tree Collapse file tree 2 files changed +20
-25
lines changed Expand file tree Collapse file tree 2 files changed +20
-25
lines changed Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ concurrency:
3030jobs :
3131 macos-napi :
3232 name : Build NAPI macos - Node ${{matrix.nodejs}} - ${{matrix.arch}}
33- runs-on : macos-latest
33+ runs-on : ${{ matrix.os }}
3434 timeout-minutes : 3000
3535
3636 strategy :
4343 - 18
4444 python :
4545 - " 3.10"
46+ include :
47+ - arch : x64
48+ os : macos-13
49+ - arch : arm64
50+ # macos-14 is used for arm64
51+ os : macos-14
4652 steps :
4753 - uses : actions/checkout@v3
4854 - name : Use Node.js ${{ matrix.nodejs }}
@@ -56,31 +62,19 @@ jobs:
5662 with :
5763 python-version : ${{ matrix.python }}
5864
59- - name : Cache Dependencies
60- id : cache-dependencies
61- uses : actions/cache@v3
62- with :
63- path : pkg/mac/build
64- key : ${{ runner.os }}-${{ matrix.arch }}-mac-${{ hashFiles('pkg/mac/build-cpp-deps-lib.sh') }}
65-
66- - name : Add arch env vars
65+ - name : Build Node binaries lib
6766 run : |
6867 if [ "${{ matrix.arch }}" = "x64" ]; then
69- echo " ARCH=x86_64" >> $GITHUB_ENV
68+ export ARCH=x86_64
7069 else
71- echo " ARCH=${{ matrix.arch }}" >> $GITHUB_ENV
70+ export ARCH=${{ matrix.arch }}
7271 fi
73-
74- - name : Build Node binaries lib
75- run : |
76- export ARCH=${{ env.ARCH }}
7772 pkg/mac/download-cpp-client.sh
7873 npm install --ignore-scripts
7974 npx node-pre-gyp configure --target_arch=${{ matrix.arch }}
8075 npx node-pre-gyp build --target_arch=${{ matrix.arch }}
8176
8277 - name : Test loading Node binaries lib
83- if : matrix.arch == 'x64'
8478 run : |
8579 node pkg/load_test.js
8680
Original file line number Diff line number Diff line change 7272
7373 macos-napi :
7474 name : Build NAPI macos - Node ${{matrix.nodejs}} - ${{matrix.arch}}
75- runs-on : macos-latest
75+ runs-on : ${{ matrix.os }}
7676 timeout-minutes : 3000
7777
7878 strategy :
8585 - 18
8686 python :
8787 - " 3.10"
88+ include :
89+ - arch : x64
90+ os : macos-13
91+ - arch : arm64
92+ # macos-14 is used for arm64
93+ os : macos-14
8894 steps :
8995 - uses : actions/checkout@v3
9096 - name : Use Node.js ${{ matrix.nodejs }}
@@ -98,24 +104,19 @@ jobs:
98104 with :
99105 python-version : ${{ matrix.python }}
100106
101- - name : Add arch env vars
107+ - name : Build Node binaries lib
102108 run : |
103109 if [ "${{ matrix.arch }}" = "x64" ]; then
104- echo " ARCH=x86_64" >> $GITHUB_ENV
110+ export ARCH=x86_64
105111 else
106- echo " ARCH=${{ matrix.arch }}" >> $GITHUB_ENV
112+ export ARCH=${{ matrix.arch }}
107113 fi
108-
109- - name : Build Node binaries lib
110- run : |
111- export ARCH=${{ env.ARCH }}
112114 pkg/mac/download-cpp-client.sh
113115 npm install --ignore-scripts
114116 npx node-pre-gyp configure --target_arch=${{ matrix.arch }}
115117 npx node-pre-gyp build --target_arch=${{ matrix.arch }}
116118
117119 - name : Test loading Node binaries lib
118- if : matrix.arch == 'x64'
119120 run : |
120121 node pkg/load_test.js
121122
You can’t perform that action at this time.
0 commit comments