Skip to content

Commit

Permalink
CI: Add darwin-arm64 to matrix
Browse files Browse the repository at this point in the history
Updates dependencies where possible whilst still maintaining
support for Node.js 10.
  • Loading branch information
lovell committed Apr 17, 2024
1 parent cd692d3 commit 546a5af
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 11 deletions.
25 changes: 15 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,26 @@ jobs:
container: node:16-alpine3.12
- os: ubuntu-22.04
container: node:18-alpine3.14
- os: macos-11
- os: macos-12
nodejs_version: 10
nodejs_arch: x64
prebuild: true
- os: macos-11
- os: macos-12
nodejs_version: 12
nodejs_arch: x64
- os: macos-11
- os: macos-12
nodejs_version: 14
nodejs_arch: x64
- os: macos-11
- os: macos-12
nodejs_version: 16
nodejs_arch: x64
- os: macos-11
- os: macos-12
nodejs_version: 18
nodejs_arch: x64
- os: macos-14
nodejs_version: 18
nodejs_arch: arm64
prebuild: true
- os: windows-2019
nodejs_version: 10
nodejs_arch: x86
Expand Down Expand Up @@ -89,8 +93,6 @@ jobs:
- os: windows-2019
nodejs_version: 18
nodejs_arch: x64
env:
CXXFLAGS: "-march=nehalem"
steps:
- name: Dependencies (Linux glibc)
if: contains(matrix.container, 'centos')
Expand All @@ -103,22 +105,25 @@ jobs:
if: contains(matrix.container, 'rockylinux')
run: |
curl -sL https://rpm.nodesource.com/setup_${{ matrix.nodejs_version }}.x | bash -
dnf install -y gcc-toolset-11-gcc-c++ make git python3 nodejs fontconfig google-noto-sans-fonts
dnf install -y gcc-toolset-11-gcc-c++ make git python3 nodejs
echo "/opt/rh/gcc-toolset-11/root/usr/bin" >> $GITHUB_PATH
- name: Dependencies (Linux musl)
if: contains(matrix.container, 'alpine')
run: apk add build-base git python3 --update-cache
- name: Dependencies (Python 3.10 - macOS, Windows)
if: contains(matrix.os, 'macos') || contains(matrix.os, 'windows')
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'
- name: Dependencies (Node.js - macOS, Windows)
if: contains(matrix.os, 'macos') || contains(matrix.os, 'windows')
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.nodejs_version }}
architecture: ${{ matrix.nodejs_arch }}
- name: Add compiler flags
if: matrix.os != 'macos-14'
run: echo "CXXFLAGS=-march=nehalem" >> $GITHUB_ENV
- name: Checkout
uses: actions/checkout@v3
- name: Install
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
],
"dependencies": {
"node-addon-api": "^5.1.0",
"prebuild-install": "^7.1.1"
"prebuild-install": "^7.1.2"
},
"devDependencies": {
"cc": "^3.0.1",
Expand Down

0 comments on commit 546a5af

Please sign in to comment.