From 75576fac3aad237921846606d5c87aeaa27a8149 Mon Sep 17 00:00:00 2001 From: Lunar Starstrum Date: Thu, 21 Mar 2024 23:23:52 -0500 Subject: [PATCH] Possibly fix Windows builds --- .github/workflows/sodium.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/sodium.yml b/.github/workflows/sodium.yml index 0995e39..4875d5f 100644 --- a/.github/workflows/sodium.yml +++ b/.github/workflows/sodium.yml @@ -24,7 +24,7 @@ jobs: - { name: "Android Arm64", os: ubuntu-latest, - command: "./dist-build/android-armv8-a.sh && ls -lsah libsodium-android-armv8-a+crypto/lib", + command: "./dist-build/android-armv8-a.sh", output-file: "libsodium-android-armv8-a+crypto/lib/libsodium.so", file: "libsodium.so", rid: "android-arm64", @@ -80,8 +80,8 @@ jobs: - { name: "Windows x86", os: windows-latest, - command: "zig build -Dshared=true -Doptimize=ReleaseFast -Dtarget=x86-windows-gnu", - output-file: "zig-out/lib/libsodium_shared.dll", + command: "cd builds/msvc/build/ && cmd buildbase.bat ../vs2022/libsodium.sln 17 && cd ../../..", + output-file: "bin/Win32/Release/v143/dynamic/libsodium.dll", file: "sodium.dll", rid: "win-x86", arch: "x86" @@ -89,8 +89,8 @@ jobs: - { name: "Windows x64", os: windows-latest, - command: "zig build -Dshared=true -Doptimize=ReleaseFast -Dtarget=x86_64-windows-gnu", - output-file: "zig-out/lib/libsodium_shared.dll", + command: "cd builds/msvc/build/ && cmd buildbase.bat ../vs2022/libsodium.sln 17 && cd ../../..", + output-file: "bin/x64/Release/v143/dynamic/libsodium.dll", file: "sodium.dll", rid: "win-x64", arch: "x64" @@ -98,8 +98,8 @@ jobs: - { name: "Windows Arm64", os: windows-latest, - command: "zig build -Dshared=true -Doptimize=ReleaseFast -Dtarget=aarch64-windows-gnu", - output-file: "zig-out/lib/libsodium_shared.dll", + command: "cd builds/msvc/build/ && cmd buildbase.bat ../vs2022/libsodium.sln 17 && cd ../../..", + output-file: "bin/arm64/Release/v143/dynamic/libsodium.dll", file: "sodium.dll", rid: "win-arm64", arch: "arm64"