@@ -13,19 +13,12 @@ permissions:
1313
1414jobs :
1515 build :
16- name : ${{ matrix.friendlyName }}
16+ name : ${{ matrix.os }}
1717
1818 strategy :
1919 matrix :
2020 node-version : [22.x]
21- os : [ubuntu-20.04, windows-2019, macos-latest]
22- include :
23- - os : ubuntu-20.04
24- friendlyName : Ubuntu
25- - os : windows-2019
26- friendlyName : Windows
27- - os : macos-latest
28- friendlyName : macOS
21+ os : [ubuntu-latest, windows-latest, macos-latest]
2922
3023 runs-on : ${{ matrix.os }}
3124
4033 libsecret-1-dev \
4134 dbus-x11 \
4235 python3-dev
43- if: ${{ matrix.os == 'ubuntu-20.04 ' }}
36+ if: ${{ matrix.os == 'ubuntu-latest ' }}
4437 name: Install additional dependencies
4538
4639 - run : npm ci
@@ -59,19 +52,19 @@ jobs:
5952 echo "Create a test key using script..."
6053 python -c "import keyring;keyring.set_password('system', 'login', 'pwd');"
6154 npm test
62- if: ${{ matrix.os == 'ubuntu-20.04 ' }}
55+ if: ${{ matrix.os == 'ubuntu-latest ' }}
6356 name: Run tests (Linux)
6457
6558 - run : npm test
66- if : ${{ matrix.os != 'ubuntu-20.04 ' }}
59+ if : ${{ matrix.os != 'ubuntu-latest ' }}
6760 name : Run tests (Windows/macOS)
6861
6962 - run : npm run prebuild-napi-x64
7063 name : Prebuild (x64)
7164
7265 - run : npm run prebuild-napi-arm64
7366 name : Prebuild (arm64)
74- if : ${{ matrix.os != 'ubuntu-20.04 ' }}
67+ if : ${{ matrix.os != 'ubuntu-latest ' }}
7568
7669 - run : npm run prebuild-napi-ia32
7770 if : ${{ matrix.os == 'windows-2019' }}
8679 docker run --rm -v ${PWD}:/project node-keytar/arm64-cross-compile /bin/bash -c "cd /project && npm run prebuild-napi-arm && rm -rf build"
8780 docker build -t node-keytar/armv7l-cross-compile docker/armv7l-cross-compile
8881 docker run --rm -v ${PWD}:/project node-keytar/armv7l-cross-compile /bin/bash -c "cd /project && npm run prebuild-napi-armv7l"
89- if: ${{ matrix.os == 'ubuntu-20.04 ' }}
82+ if: ${{ matrix.os == 'ubuntu-latest ' }}
9083 name: Prebuild (Linux x86 + ARM64 + ARMV7L)
9184
9285 - run : |
0 commit comments