Try to create arm prebuilds

.github/workflows/libtest-macos.yml

@@ -36,6 +36,9 @@ jobs:
 
       - name: Build library
         run: npm run build
+
+      - name: Test architecture
+        run: lipo -info build_darwin_x64/Release/webtransport.node
 
       - name: Run unit tests
         run: NODE_ENV=production npm test

.github/workflows/libtest-macosarmcross.yml

@@ -0,0 +1,60 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Mac OS ARM Automated cross build
+
+# Controls when the workflow will run
+on:
+  # Triggers the workflow on push or pull request events but only for the master branch
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build-macosarm:
+    # The type of runner that the job will run on
+    runs-on: macos-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive   
+
+      - name: Install icu libs
+      # modified snippet from https://github.com/Homebrew/discussions/discussions/2843
+        run: | 
+          mkdir -p ../armhomebrew && curl -L https://github.com/Homebrew/brew/tarball/master | tar xz --strip 1 -C ../armhomebrew 
+          echo "Step1 finished"
+          #../armhomebrew/bin/brew fetch --force --bottle-tag=arm64_big_sur icu4c | grep "Downloaded to"
+          response=$(../armhomebrew/bin/brew fetch --force --bottle-tag=arm64_big_sur icu4c | grep "Downloaded to")
+          echo "Step2 finished with response $response"
+          parsed=($response)  
+          echo "Step3 install ${parsed[2]}"
+          ../armhomebrew/bin/brew install ${parsed[2]}
+          echo "Step4"
+          echo "icu4c will be in $(../armhomebrew/bin/brew --prefix)/opt/icu4c"
+          echo "LOCALHOMEWBREWICU=$(../armhomebrew/bin/brew --prefix)/opt/icu4c"
+          echo "LOCALHOMEWBREWICU=$(../armhomebrew/bin/brew --prefix)/opt/icu4c" >> $GITHUB_ENV
+
+      - name: Test
+        run: echo ${{ env.LOCALHOMEWBREWICU }}
+
+      - name: Set up NodeJS
+        uses: actions/setup-node@v1
+        with:
+          node-version: 16
+      - name: Install dependencies
+        run: npm install
+
+      - name: Build library
+        run: BUILDARCH="arm64" LOCALHOMEWBREWICU=${{ env.LOCALHOMEWBREWICU }} npm run build
+
+#      - name: Run unit tests
+#       run: NODE_ENV=production npm test

.github/workflows/publish-packages.yml

@@ -61,6 +61,8 @@ jobs:
         include:
           - arch: ia32
             os: windows-2019
+          - arch: arm64
+            os: macos-latest
     runs-on: ${{ matrix.os }}
     permissions:
       contents: write
@@ -69,6 +71,21 @@ jobs:
      - name: Install missing software for Windows
        if: runner.os == 'Windows'
        run: choco install nasm -yv
+    # modified snippet from https://github.com/Homebrew/discussions/discussions/2843
+     - name: Install icu for Mac Arm cross compile
+       if: ${{ (matrix.arch == 'arm64') && (matrix.os == 'macos-latest')}}
+       run: | 
+          mkdir -p ../armhomebrew && curl -L https://github.com/Homebrew/brew/tarball/master | tar xz --strip 1 -C ../armhomebrew 
+          echo "Step1 finished"
+          #../armhomebrew/bin/brew fetch --force --bottle-tag=arm64_big_sur icu4c | grep "Downloaded to"
+          response=$(../armhomebrew/bin/brew fetch --force --bottle-tag=arm64_big_sur icu4c | grep "Downloaded to")
+          echo "Step2 finished with response $response"
+          parsed=($response)  
+          echo "Step3 install ${parsed[2]}"
+          ../armhomebrew/bin/brew install ${parsed[2]}
+          echo "Step4"
+          echo "icu4c will be in $(../armhomebrew/bin/brew --prefix)/opt/icu4c"
+          echo "LOCALHOMEWBREWICU=$(../armhomebrew/bin/brew --prefix)/opt/icu4c" >> $GITHUB_ENV
      - name: Checkout code
        uses: actions/checkout@v2
        with:
@@ -86,6 +103,7 @@ jobs:
        env: 
          BUILDARCH: ${{ matrix.arch }}
          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+         LOCALHOMEWBREWICU: ${{ env.LOCALHOMEWBREWICU }}
        run: node build.js prebuild
 
 # code is not ready... if anyone needs it, I am open for PR

CMakeLists.txt

@@ -18,9 +18,22 @@ set(BUILD_TESTING OFF)
 
 set(protobuf_BUILD_PROTOC_BINARIES ON)
 
+
 IF( NOT WIN32)
     IF(APPLE)
-        SET(ICU_ROOT "/usr/local/opt/icu4c")
+        IF(DEFINED ENV{LOCALHOMEWBREWICU})
+            MESSAGE(STATUS "Local homebrew icu detected")
+            MESSAGE(STATUS $ENV{LOCALHOMEWBREWICU})
+            SET(ICU_ROOT $ENV{LOCALHOMEWBREWICU})
+        ELSE()
+            IF(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
+                MESSAGE(STATUS "set icu root local")
+                SET(ICU_ROOT "/usr/local/opt/icu4c")
+            ELSE()
+                MESSAGE(STATUS "set icu root homebrew")
+                SET(ICU_ROOT "/opt/homebrew/icu4c")
+            ENDIF()
+        ENDIF()
     ENDIF(APPLE)
     find_package(ICU COMPONENTS uc i18n REQUIRED)
 ENDIF(NOT WIN32)
@@ -42,6 +55,9 @@ add_subdirectory(third_party/libevent EXCLUDE_FROM_ALL)
 SET(protobuf_WITH_ZLIB OFF CACHE BOOL "Build with zlib support")
 SET(protobuf_BUILD_TESTS OFF CACHE BOOL "Build tests")
 add_subdirectory(third_party/protobuf EXCLUDE_FROM_ALL)
+IF(APPLE)
+    set_target_properties(protoc libprotoc libprotobuf PROPERTIES OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "Build architectures for Mac OS X" FORCE )
+ENDIF(APPLE)
 
 IF (WIN32)
     add_compile_definitions(WIN32_LEAN_AND_MEAN NOGDI)
@@ -908,6 +924,7 @@ ELSE(WIN32)
     )
 ENDIF(WIN32)
 
+
 add_custom_command(
 OUTPUT
 ${CMAKE_CURRENT_SOURCE_DIR}/third_party/quiche/quiche/quic/core/proto/cached_network_parameters.pb.h

build.js

@@ -201,10 +201,14 @@ if (argv.length > 2) {
   ]
   if (platform === 'win32') platformargs.push('-t', 'ClangCL')
   const pbargs = []
-  if (platform === 'win32') pbargs.push('-t', 'ClangCL')
   const pbargspre = []
-  if (env.BUILDARCH) pbargspre.push('--arch', env.BUILDARCH)
+  if (platform === 'win32') pbargs.push('-t', 'ClangCL') 
+  if (env.BUILDARCH) {
+    pbargspre.push('--arch', env.BUILDARCH)
+    platformargs.push('--arch', env.BUILDARCH)
+  }
   if (env.GH_TOKEN) pbargspre.push('--u', env.GH_TOKEN)
+
   switch (argv[2]) {
     case 'prebuild':
       try {