attempt to also build mac intel packages

Author: SamSaffron

.github/workflows/build.yml

@@ -78,7 +78,8 @@ jobs:
       matrix:
         platform:
           - arm64
-    name: Build (darwin)
+          - x86_64
+    name: Build (darwin) (${{ matrix.platform }})
     outputs:
       GEM_VERSION: ${{ steps.set-metadata.outputs.GEM_VERSION }}
     runs-on: macos-15-xlarge
@@ -123,10 +124,9 @@ jobs:
         run: |
             ./libexec/inject-libv8 ${{ steps.set-metadata.outputs.NODE_VERSION }}
       - name: Test V8 in C++
-        if: matrix.platform != 'arm64'
         run: |
             cd test/gtest
-            cmake -S . -B build
+            cmake -S . -B build -DCMAKE_OSX_ARCHITECTURES=${{ matrix.platform }}
             cd build
             cmake --build .
             ./c_v8_tests
@@ -351,15 +351,15 @@ jobs:
       matrix:
         platform:
           - x86_64
-          # arm64
-    name: Test (darwin)
+          - arm64
+    name: Test (darwin) (${{ matrix.platform }})
     needs: build-darwin
     runs-on: macos-15-xlarge
     steps:
       - name: Set metadata
         id: set-metadata
         run: |
-            ruby -e 'puts Gem.platforms.last.to_s.gsub(/-darwin-?\d+/, "-darwin")' | tee gem_platform
+            echo "${{ matrix.platform }}-darwin" | tee gem_platform
             echo "GEM_PLATFORM=$(cat gem_platform)" >> $GITHUB_OUTPUT
       - name: Download a single artifact
         uses: actions/download-artifact@v4

README.md

@@ -32,17 +32,14 @@ Here's an informal list of platforms we push so far, with equally informal tiers
 
 Tier 0 (CI built and tested):
 
-- x86_64-darwin (17 to 20)
+- x86_64-darwin
+- arm64-darwin
 - x86_64-linux
 - x86_64-linux-musl
+- aarch64-linux
 
 Tier 1 (manual build and test):
 
-- arm64-darwin (20)
-
-Tier 2 (manual build and test, has known stability issues):
-
-- aarch64-linux
 - aarch64-linux-musl
 
 As a fallback, the source gem (`ruby` gem platform) should compile on all Node supported platforms (including e.g. ppc64le or solaris), but we may not have tested it. Help is welcome!
@@ -61,9 +58,9 @@ There is an outstanding issue with rubygems and bundler, where it may misselect
 
 ## Versioning
 
-The gem versioning is Node-based, e.g node 15.14.0 gives the gem 15.14.0.0. The last number is an increment for libv8-node fixes. We try as mucha s possible not to include too much changes in such gem fixes, so you can consider these like "patch" in semver.
+The gem versioning is Node-based, e.g node 15.14.0 gives the gem 15.14.0.0. The last number is an increment for libv8-node fixes. We try as much as possible not to include too much changes in such gem fixes, so you can consider these like "patch" in semver.
 
-Compared to the `libv8` gem, there is no odd/even scheme, thanks to the intriduction in bundler of the `force_ruby_platform` flag.
+Compared to the `libv8` gem, there is no odd/even scheme, thanks to the introduction in bundler of the `force_ruby_platform` flag.
 
 ## Requirements
 

libexec/build-libv8

@@ -45,7 +45,7 @@ fi
 
 if [ "${BUILDTYPE}" = "Release" ] && [ "${GITHUB_ACTIONS}" != "" ]; then
 	case "${target_platform}" in
-		arm64*-darwin*)
+		*-darwin*)
 			# dwarf debug info for v8 is so massive the macos
 			# builder runs out of disk space when it's enabled
 			find out -name '*.mk' -exec sed -i '' -e 's/gdwarf-2/g0/g' {} ';'

test/gtest/CMakeLists.txt

@@ -27,7 +27,15 @@ target_link_libraries(
 )
 
 string(TOLOWER ${CMAKE_SYSTEM_NAME} system_name)
-string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} system_arch)
+if(APPLE AND CMAKE_OSX_ARCHITECTURES)
+  string(TOLOWER ${CMAKE_OSX_ARCHITECTURES} system_arch)
+else()
+  string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} system_arch)
+endif()
+
+if(system_arch STREQUAL "aarch64")
+  set(system_arch "arm64")
+endif()
 
 set(vendor_arch "${system_arch}-${system_name}")