From c015d1c9a2cebed9332aa7726b9e44d767d0ec95 Mon Sep 17 00:00:00 2001 From: Caelan Sayler Date: Fri, 13 May 2022 16:31:05 +0100 Subject: [PATCH] lipo doesn't like merging osx.10.12-x64 and osx.11.0-arm64 --- .github/workflows/build.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 15988493..06128d03 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,17 +53,19 @@ jobs: with: dotnet-version: 6.0.* - name: Build SquirrelMac - run: | - dotnet publish -v minimal -c Release -r osx.10.12-x64 --self-contained=true ./src/Squirrel.CommandLine.OSX/Squirrel.CommandLine.OSX.csproj -o ./publish - mv ./publish/SquirrelMac ./publish/SquirrelMac-x64 - dotnet publish -v minimal -c Release -r osx.11.0-arm64 --self-contained=true ./src/Squirrel.CommandLine.OSX/Squirrel.CommandLine.OSX.csproj -o ./publish - mkdir ./bundle - lipo -create -output ./bundle/SquirrelMac ./publish/SquirrelMac ./publish/SquirrelMac-x64 + run: dotnet publish -v minimal -c Release -r osx.10.12-x64 --self-contained ./src/Squirrel.CommandLine.OSX/Squirrel.CommandLine.OSX.csproj -o ./publish +# - name: Build SquirrelMac +# run: | +# dotnet publish -v minimal -c Release -r osx.10.12-x64 --self-contained ./src/Squirrel.CommandLine.OSX/Squirrel.CommandLine.OSX.csproj -o ./publish +# mv ./publish/SquirrelMac ./publish/SquirrelMac-x64 +# dotnet publish -v minimal -c Release -r osx.11.0-arm64 --self-contained=true ./src/Squirrel.CommandLine.OSX/Squirrel.CommandLine.OSX.csproj -o ./publish +# mkdir ./bundle +# lipo -create -output ./bundle/SquirrelMac ./publish/SquirrelMac ./publish/SquirrelMac-x64 - name: Build UpdateMac - run: dotnet publish -v minimal -c Release -r osx.10.12-x64 --self-contained=true ./src/Update.OSX/Update.OSX.csproj -o ./bundle + run: dotnet publish -v minimal -c Release -r osx.10.12-x64 --self-contained ./src/Update.OSX/Update.OSX.csproj -o ./publish - name: Upload MacOS Artifacts uses: actions/upload-artifact@v3 with: name: osx-tools - path: .\build\bundle\* + path: ./publish/* \ No newline at end of file