Skip to content

Commit

Permalink
Merge branch 'main' into windows-arm
Browse files Browse the repository at this point in the history
  • Loading branch information
thegecko committed Oct 19, 2024
2 parents e0b7c1e + 20d0e64 commit 7ef6121
Show file tree
Hide file tree
Showing 5 changed files with 2,440 additions and 2,232 deletions.
28 changes: 13 additions & 15 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,50 +13,48 @@ jobs:
matrix:
include:
- name: darwin
os: macos-11
os: macos-latest
node: x64
command: prebuildify
args: --arch x64+arm64 --target 14.0.0
args: --arch x64+arm64
- name: win32-x86
os: windows-2019
node: x86
command: prebuildify
args: --target 14.0.0
- name: win32-x64
os: windows-2019
node: x64
command: prebuildify
args: --target 14.0.0
- name: win32-arm64
os: windows-2019
command: prebuildify
args: --arch arm64 --target 20.11.1
- name: linux-x64
os: ubuntu-latest
command: prebuildify-cross
args: -i centos7-devtoolset7 -i alpine --target 14.0.0
args: -i centos7-devtoolset7 -i alpine
- name: linux-arm
os: ubuntu-latest
command: prebuildify-cross
args: -i linux-arm64-lts -i linux-armv7 -i linux-armv6 --target 14.0.0
args: -i linux-arm64-lts -i linux-armv7 -i linux-armv7l-musl -i linux-armv6
- name: android-arm
os: ubuntu-latest
command: prebuildify-cross
args: -i android-arm64 -i android-armv7 --target 14.0.0
args: -i android-arm64 -i android-armv7
name: Build ${{ matrix.name }}
runs-on: ${{ matrix.os }}
steps:
- if: matrix.os == 'macos-11'
run: sudo -H pip install setuptools
- if: matrix.node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18.x
node-version: 20
architecture: ${{ matrix.node }}
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: npm ci
- run: npm run ${{ matrix.command }} -- ${{ matrix.args }}
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: build-artifacts
path: prebuilds/
Expand All @@ -68,14 +66,14 @@ jobs:
name: Release
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/download-artifact@v3
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
name: build-artifacts
path: prebuilds
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18.x
node-version: 20
- run: npm ci
- run: npm run build
- run: npm run semantic-release
Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: 18.x
Expand All @@ -20,22 +20,20 @@ jobs:
runs-on: ${{ matrix.config.os }}
strategy:
matrix:
node-version: [16.x, 18.x, 20.x]
node-version: [18.x, 20.x, 22.x]
config:
# arch isn't used and we have no way to use it currently
- { os: macos-latest, arch: x64 }
- { os: ubuntu-latest, arch: x64 }
- { os: windows-2019, arch: x64 }
steps:
- if: matrix.config.os == 'macos-latest'
run: sudo -H pip install setuptools
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- run: npm ci
- run: npm run rebuild
- run: npm test
- uses: codecov/codecov-action@v3
- uses: codecov/codecov-action@v4
with:
directory: ./coverage/
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.17.1
20.18.0
Loading

0 comments on commit 7ef6121

Please sign in to comment.