diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 382fbd0af3..46448b731a 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -28,6 +28,10 @@ jobs: with: name: build-win-x86 path: bin/Win32/Release/v143/dynamic/libsodium.dll + - uses: actions/upload-artifact@v4 + with: + name: build-win-arm64 + path: bin/ARM64/Release/v143/dynamic/libsodium.dll build-others: runs-on: ubuntu-latest @@ -38,14 +42,6 @@ jobs: version: master - uses: actions/checkout@v4 - - name: build-win-arm64 - run: | - rm -fr zig-out .zig-cache; zig build -Doptimize=ReleaseFast -Dtarget=aarch64-windows - - uses: actions/upload-artifact@v4 - with: - name: build-win-arm64 - path: zig-out/bin/libsodium.dll - - name: build-linux-x64 run: | rm -fr zig-out .zig-cache; zig build -Doptimize=ReleaseFast -Dtarget=x86_64-linux-gnu.2.17 @@ -147,7 +143,7 @@ jobs: - build-apple - build-others container: - image: mcr.microsoft.com/dotnet/sdk:8.0 + image: mcr.microsoft.com/dotnet/sdk:6.0 env: DOTNET_CLI_TELEMETRY_OPTOUT: 1 DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1 @@ -236,7 +232,7 @@ jobs: needs: - pack container: - image: mcr.microsoft.com/dotnet/sdk:8.0 + image: mcr.microsoft.com/dotnet/sdk:6.0 env: DOTNET_CLI_TELEMETRY_OPTOUT: 1 DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1 @@ -265,9 +261,9 @@ jobs: - name: Move Build Output run: | mkdir .libsodium-builds - mv .libsodium-test/bin/Release/net8.0/linux-arm/publish .libsodium-builds/linux-arm - mv .libsodium-test/bin/Release/net8.0/linux-arm64/publish .libsodium-builds/linux-arm64 - mv .libsodium-test/bin/Release/net8.0/linux-x64/publish .libsodium-builds/linux-x64 + mv .libsodium-test/bin/Release/net6.0/linux-arm/publish .libsodium-builds/linux-arm + mv .libsodium-test/bin/Release/net6.0/linux-arm64/publish .libsodium-builds/linux-arm64 + mv .libsodium-test/bin/Release/net6.0/linux-x64/publish .libsodium-builds/linux-x64 - uses: actions/upload-artifact@v4 with: name: test-builds @@ -280,7 +276,7 @@ jobs: - build-test-binaries strategy: matrix: - arch: [ 'centos:8', 'debian:11' ] + arch: [ 'centos:8', 'debian:10' ] container: image: ${{ matrix.arch }} env: @@ -296,7 +292,7 @@ jobs: .libsodium-builds/linux-x64/Tests run-test-binaries-cross-plat: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: - build-test-binaries env: