Perform macOS Intel builds (#77)

Fixes: #76 Signed-off-by: Juan Cruz Viotti <[email protected]>
sourcemeta · Jun 11, 2024 · 74d06c5 · 74d06c5
1 parent ae526da
commit 74d06c5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -24,7 +24,11 @@ jobs:
             cc: clang
             cxx: clang++
             shell: sh
-          - os: macos-latest
+          - os: macos-13
+            cc: clang
+            cxx: clang++
+            shell: sh
+          - os: macos-14
             cc: clang
             cxx: clang++
             shell: sh

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -17,7 +17,11 @@ jobs:
             cc: gcc
             cxx: g++
             shell: sh
-          - os: macos-latest
+          - os: macos-13
+            cc: clang
+            cxx: clang++
+            shell: sh
+          - os: macos-14
             cc: clang
             cxx: clang++
             shell: sh
@@ -68,6 +72,8 @@ jobs:
       # Better to be sure and `cd` all the time here.
       - run: cd ./build && ctest --build-config Release --output-on-failure --parallel
 
+      - run: cpack --config build/CPackConfig.cmake -B build/out -C Release
+
   docker:
     runs-on: ubuntu-latest
     steps:

diff --git a/npm-deploy.sh b/npm-deploy.sh
@@ -18,11 +18,14 @@ echo "Preparing $VERSION" 1>&2
 PACKAGE_BASE_URL="https://github.com/intelligence-ai/jsonschema/releases/download/v$VERSION"
 curl --retry 5 --location --output "$OUTPUT/npm/artifacts/darwin-arm64.zip" \
   "$PACKAGE_BASE_URL/jsonschema-$VERSION-darwin-arm64.zip"
+curl --retry 5 --location --output "$OUTPUT/npm/artifacts/darwin-x86_64.zip" \
+  "$PACKAGE_BASE_URL/jsonschema-$VERSION-darwin-x86_64.zip"
 curl --retry 5 --location --output "$OUTPUT/npm/artifacts/linux-x86_64.zip" \
   "$PACKAGE_BASE_URL/jsonschema-$VERSION-linux-x86_64.zip"
 curl --retry 5 --location --output "$OUTPUT/npm/artifacts/windows-x86_64.zip" \
   "$PACKAGE_BASE_URL/jsonschema-$VERSION-windows-x86_64.zip"
 unzip -o "$OUTPUT/npm/artifacts/darwin-arm64.zip" -d "$OUTPUT/npm/artifacts"
+unzip -o "$OUTPUT/npm/artifacts/darwin-x86_64.zip" -d "$OUTPUT/npm/artifacts"
 unzip -o "$OUTPUT/npm/artifacts/linux-x86_64.zip" -d "$OUTPUT/npm/artifacts"
 unzip -o "$OUTPUT/npm/artifacts/windows-x86_64.zip" -d "$OUTPUT/npm/artifacts"
 ls -l "$OUTPUT/npm/artifacts"
@@ -33,6 +36,8 @@ mkdir -p "$OUTPUT/npm/staging"
 
 install -m 0755 "$OUTPUT/npm/artifacts/jsonschema-$VERSION-darwin-arm64/bin/jsonschema" \
   "$OUTPUT/npm/staging/jsonschema-darwin-arm64"
+install -m 0755 "$OUTPUT/npm/artifacts/jsonschema-$VERSION-darwin-x86_64/bin/jsonschema" \
+  "$OUTPUT/npm/staging/jsonschema-darwin-x86_64"
 install -m 0755 "$OUTPUT/npm/artifacts/jsonschema-$VERSION-linux-x86_64/bin/jsonschema" \
   "$OUTPUT/npm/staging/jsonschema-linux-x86_64"
 install -m 0755 "$OUTPUT/npm/artifacts/jsonschema-$VERSION-windows-x86_64/bin/jsonschema.exe" \