Add macOS arm64 support (#132)

Author: drasticactions

.github/workflows/ci.yml

@@ -35,6 +35,8 @@ jobs:
             name: linux-arm
           - os: macos-10.15
             name: osx-x64
+          - os: macos-11
+            name: osx-arm64
       fail-fast: false
     steps:
       - name: Checkout

README.md

@@ -10,7 +10,7 @@ This package contains the compiled versions of the libgit2 native library for
 the following platforms:
 
  - Windows (x86, x64, arm64)
- - macOS (x64)
+ - macOS (x64, arm64)
  - Linux (arm, arm64, x64)
 
  [lg2s-nb]: https://www.nuget.org/packages/LibGit2Sharp.NativeBinaries

UpdateLibgit2ToSha.ps1

@@ -124,6 +124,7 @@ Push-Location $libgit2Directory
     <dllmap os="linux" cpu="arm" wordsize="32" dll="$binaryFilename" target="lib/linux-arm/lib$binaryFilename.so" />
     <dllmap os="linux" cpu="armv8" wordsize="64" dll="$binaryFilename" target="lib/linux-arm64/lib$binaryFilename.so" />
     <dllmap os="osx" cpu="x86-64" wordsize="64" dll="$binaryFilename" target="lib/osx-x64/lib$binaryFilename.dylib" />
+    <dllmap os="osx" cpu="armv8" wordsize="64" dll="$binaryFilename" target="lib/osx-arm64/lib$binaryFilename.dylib" />
 </configuration>
 "@
 

build.libgit2.sh

@@ -7,9 +7,13 @@ SHORTSHA=${LIBGIT2SHA:0:7}
 OS=`uname`
 ARCH=`uname -m`
 PACKAGEPATH="nuget.package/runtimes"
+OSXARCHITECTURE="x86_64"
 
 if [[ $OS == "Darwin" ]]; then
 	USEHTTPS="ON"
+	if [[ $ARCH == "arm64" ]]; then
+		OSXARCHITECTURE="arm64"
+	fi
 else
 	USEHTTPS="OpenSSL-Dynamic"
 fi
@@ -25,15 +29,17 @@ if [[ $RID == *arm ]]; then
 fi
 
 if [[ $RID == *arm64 ]]; then
-	export TOOLCHAIN_FILE=/nativebinaries/CMakeLists.arm64.txt
+	if [[ $OS != "Darwin" ]]; then
+		export TOOLCHAIN_FILE=/nativebinaries/CMakeLists.arm64.txt
+	fi
 fi
 
 cmake -DCMAKE_BUILD_TYPE:STRING=Release \
       -DBUILD_CLAR:BOOL=OFF \
       -DUSE_SSH=OFF \
       -DENABLE_TRACE=ON \
       -DLIBGIT2_FILENAME=git2-$SHORTSHA \
-      -DCMAKE_OSX_ARCHITECTURES="x86_64" \
+      -DCMAKE_OSX_ARCHITECTURES=$OSXARCHITECTURE \
       -DUSE_HTTPS=$USEHTTPS \
       -DUSE_BUNDLED_ZLIB=ON \
       -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE} \

nuget.package/libgit2/LibGit2Sharp.dll.config

@@ -3,4 +3,5 @@
     <dllmap os="linux" cpu="arm" wordsize="32" dll="git2-b7bad55" target="lib/linux-arm/libgit2-b7bad55.so" />
     <dllmap os="linux" cpu="armv8" wordsize="64" dll="git2-b7bad55" target="lib/linux-arm64/libgit2-b7bad55.so" />
     <dllmap os="osx" cpu="x86-64" wordsize="64" dll="git2-b7bad55" target="lib/osx-x64/libgit2-b7bad55.dylib" />
+    <dllmap os="osx" cpu="armv8" wordsize="64" dll="git2-b7bad55" target="lib/osx-arm64/libgit2-b7bad55.dylib" />
 </configuration>