From 081888c7ffdb62025b6891378bd33265e5db501e Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Wed, 1 Mar 2023 10:05:56 +0000 Subject: [PATCH 1/3] Build fat dylibs on macOS --- .github/workflows/ci.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bcde29a..a80341b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,9 +13,17 @@ jobs: build: strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + platform: + - name: Linux (amd64) + os: ubuntu-latest + - name: macOS (amd64, arm64) + os: macos-latest + cmake_options: -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" + - name: Windows (amd64) + os: windows-latest - runs-on: ${{matrix.os}} + name: "Build: ${{ matrix.platform.name }}" + runs-on: ${{ matrix.platform.os }} steps: - name: Checkout @@ -59,7 +67,8 @@ jobs: -DBUILD_CLAR=OFF \ -DUSE_SSH=OFF \ -DUSE_BUNDLED_ZLIB=ON \ - -DLIBGIT2_FILENAME="${LIBGIT2_BASENAME}" + -DLIBGIT2_FILENAME="${LIBGIT2_BASENAME}" \ + ${{ matrix.platform.cmake_options }} cmake --build . --config ${BUILD_TYPE} echo "platform=${PLATFORM}" >> $GITHUB_OUTPUT From 7aff2e86fb04661e1b2cafb38697514789fa5c0d Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Wed, 1 Mar 2023 13:12:53 +0000 Subject: [PATCH 2/3] don't build tests --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a80341b..32c31f5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,7 +64,7 @@ jobs: cmake "${LIBGIT2_SRC}" \ -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" \ -DBUILD_SHARED_LIBS=ON \ - -DBUILD_CLAR=OFF \ + -DBUILD_TESTS=OFF \ -DUSE_SSH=OFF \ -DUSE_BUNDLED_ZLIB=ON \ -DLIBGIT2_FILENAME="${LIBGIT2_BASENAME}" \ From 98bc3017509d9a336da2b81f480edeface957e97 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Wed, 1 Mar 2023 16:55:13 +0000 Subject: [PATCH 3/3] ci: only upload nupkg --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32c31f5..4f07a28 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -142,4 +142,4 @@ jobs: uses: actions/upload-artifact@v3 with: name: nuget - path: build/${{steps.build.outputs.package}} + path: build/${{steps.build.outputs.package}}/Dogged.Native.Binaries.${{steps.version.outputs.version}}.nupkg