Skip to content

Commit ef69767

Browse files
committed
feat: added darwin universal binary
1 parent 78d6fa6 commit ef69767

File tree

4 files changed

+47
-1
lines changed

4 files changed

+47
-1
lines changed

.gitlab-ci.yml

+3
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,9 @@ build:macos:
185185
# Build x64 and arm64 separately
186186
- npm run prebuild --verbose -- --arch x64 --production
187187
- npm run prebuild --verbose -- --arch arm64 --production
188+
- lipo -create -output prebuild/exec-darwin-x64+arm64.node prebuild/exec-darwin-arm64.node prebuild/exec-darwin-x64.node
189+
# Force remove any downloaded native bindings, so we only test with our builds
190+
- rm -rf node_modules/@matrixai/exec-*
188191
- npm test -- --ci --coverage
189192
artifacts:
190193
when: always

package-lock.json

+36
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"optionalDependencies": {
3535
"@matrixai/exec-darwin-arm64": "0.1.2",
3636
"@matrixai/exec-darwin-x64": "0.1.2",
37+
"@matrixai/exec-darwin-universal": "0.1.2",
3738
"@matrixai/exec-linux-x64": "0.1.2"
3839
},
3940
"devDependencies": {

scripts/prepublishOnly.js

+7-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,13 @@ async function main(argv = process.argv) {
6363
// This is `name-platform-arch`
6464
const name = path.basename(buildName, '.node');
6565
// This is `@org/name-platform-arch`, uses `posix` to force usage of `/`
66-
const packageName = path.posix.join(orgName ?? '', name);
66+
let packageName = path.posix.join(orgName ?? '', name);
67+
// Check and rename any universal packages as universal
68+
if (packageName.includes('+')) {
69+
const packageNameSplit = packageName.split('-');
70+
packageNameSplit[2] = 'universal';
71+
packageName = packageNameSplit.join('-');
72+
}
6773
const constraints = name.match(
6874
/^(?:[^-]+)-(?<platform>[^-]+)-(?<arch>[^-]+)$/,
6975
);

0 commit comments

Comments
 (0)