Skip to content

Add M1 prebuilds #2245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Add M1 prebuilds #2245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7133de2
Add arm64 support
davidanthoff May 16, 2023
0b8bac4
Change label
davidanthoff May 16, 2023
ee0a6b8
Skip tests on M1
davidanthoff May 16, 2023
ded6a7d
Add arch to archive name
davidanthoff May 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/prebuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,12 @@ jobs:
matrix:
node: [20]
canvas_tag: ["v2.11.2"] # e.g. "v2.6.1"
name: ${{ matrix.canvas_tag}}, Node.js ${{ matrix.node }}, macOS
arch: ["x64", "arm64"]
name: ${{ matrix.canvas_tag}}, Node.js ${{ matrix.node }}, ${{ matrix.arch }}, macOS
runs-on: macos-latest
env:
CANVAS_VERSION_TO_BUILD: ${{ matrix.canvas_tag }}
CANVAS_ARCH_TO_BUILD: ${{ matrix.arch }}
steps:
- uses: actions/checkout@v2
with:
Expand All @@ -170,10 +172,11 @@ jobs:
npm install --ignore-scripts
. prebuild/macOS/preinstall.sh
cp prebuild/macOS/binding.gyp binding.gyp
node-gyp rebuild -j 2
node-gyp rebuild -j 2 --arch=${{ matrix.arch }}
. prebuild/macOS/bundle.sh

- name: Test binary
if: matrix.arch == 'x64'
run: |
brew uninstall --force --ignore-dependencies cairo pango librsvg giflib harfbuzz
npm test
Expand Down
3 changes: 2 additions & 1 deletion prebuild/tarball.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ FILENAME=$(
node -e "
var p = process, v = p.versions, libc = require('detect-libc').familySync() || 'unknown';
const tagName = p.env.UPLOAD_TO || p.env.CANVAS_VERSION_TO_BUILD;
console.log(['canvas', tagName, 'node-v' + v.modules, p.platform, libc, p.arch].join('-'));
const arch = p.env.CANVAS_ARCH_TO_BUILD || p.arch;
console.log(['canvas', tagName, 'node-v' + v.modules, p.platform, libc, arch].join('-'));
"
).tar.gz;

Expand Down