Skip to content

Commit

Permalink
[node][opengl-2] Update workflow for node 21 + allow publish from ope…
Browse files Browse the repository at this point in the history
…ngl-2 branch (maplibre#1941)

Co-authored-by: mwilsnd <mwilsnd@gmail.com>
Co-authored-by: Bart Louwers <bart@emeel.net>
  • Loading branch information
3 people committed Dec 31, 2023
1 parent 5934abb commit c37506b
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 274 deletions.
259 changes: 0 additions & 259 deletions .github/workflows/node-ci-mac.yml

This file was deleted.

3 changes: 1 addition & 2 deletions .github/workflows/node-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ jobs:
"PATH=$env:PATH" | Out-File -FilePath $env:GITHUB_ENV -Append
- name: Setup cmake (Linux)
if: runner.os == 'Linux' && runner.arch != 'arm64'
if: runner.os == 'Linux' && matrix.arch != 'arm64'
uses: jwlawson/actions-setup-cmake@v1.14
with:
cmake-version: "3.19.x"
Expand Down Expand Up @@ -276,6 +276,5 @@ jobs:
# On PRs make sure that the npm package can be packaged.
- name: Pack
if: github.ref != 'refs/heads/main'
run: |
npm pack --dry-run
6 changes: 3 additions & 3 deletions .github/workflows/node-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ jobs:
"PATH=$env:PATH" | Out-File -FilePath $env:GITHUB_ENV -Append
- name: Setup cmake (Linux)
if: runner.os == 'Linux' && runner.arch != 'arm64'
if: runner.os == 'Linux' && matrix.arch != 'arm64'
uses: jwlawson/actions-setup-cmake@v1.14
with:
cmake-version: "3.19.x"
Expand Down Expand Up @@ -220,7 +220,7 @@ jobs:
cmake --build build
- name: Publish X64 Release to Github
if: github.ref == 'refs/heads/main' && matrix.arch == 'x86_64'
if: matrix.arch == 'x86_64'
env:
PUBLISH: true
BUILDTYPE: RelWithDebInfo
Expand All @@ -229,7 +229,7 @@ jobs:
./platform/node/scripts/publish.sh
- name: Publish ARM Release to Github
if: github.ref == 'refs/heads/main' && matrix.arch == 'arm64'
if: matrix.arch == 'arm64'
env:
PUBLISH: true
BUILDTYPE: RelWithDebInfo
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"license": "BSD-2-Clause",
"dependencies": {
"@acalcutt/node-pre-gyp": "^1.0.11",
"@acalcutt/node-pre-gyp": "^1.0.14",
"@acalcutt/node-pre-gyp-github": "1.4.8",
"minimatch": "^7.2.0",
"npm-run-all": "^4.0.2"
Expand Down
4 changes: 2 additions & 2 deletions platform/node/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
Binaries are available and downloaded during install for the following platforms:

- Operating systems:
- Ubuntu 20.04 (amd64/arm64)
- Ubuntu 22.04 (amd64/arm64)
- macOS 12 (amd64/arm64)
- Windows (amd64)
- Node.js 14, 16, 18
- Node.js 16, 18, 20

Run:

Expand Down

0 comments on commit c37506b

Please sign in to comment.