From 70a66eab48d1d79885fbc5f76d32841833d5eabb Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Sat, 27 Apr 2024 00:10:18 +0200
Subject: [PATCH] Update zig action; musl builds are static

---
 .github/workflows/ci.yml          |  2 +-
 .github/workflows/dotnet-core.yml | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eaab1409dd..da387a0581 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,7 +41,7 @@ jobs:
         run: sudo apt-get update
 
       - name: Install Zig
-        uses: goto-bus-stop/setup-zig@d866436887ad1b24590684f9d00480376663dd36
+        uses: goto-bus-stop/setup-zig@2a9625d550eefc3a9b1a43d342ad655f563f8241
         with:
           version: 0.12.0
 
diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
index 506c32266d..913cc0ddd0 100644
--- a/.github/workflows/dotnet-core.yml
+++ b/.github/workflows/dotnet-core.yml
@@ -24,17 +24,17 @@ jobs:
           name: build-win-x86
           path: bin/Win32/Release/v143/dynamic/libsodium.dll
 
-  build-linux-glibc:
+  build-linux-glibc-x64:
     runs-on: ubuntu-latest
     steps:
       - name: Install Zig
-        uses: goto-bus-stop/setup-zig@d866436887ad1b24590684f9d00480376663dd36
+        uses: goto-bus-stop/setup-zig@2a9625d550eefc3a9b1a43d342ad655f563f8241
         with:
           version: 0.12.0
       - uses: actions/checkout@v3
       - name: build
         run: |
-          zig build -Doptimize=ReleaseFast -Dtarget=x86_64-linux-gnu.2.17 -Dcpu=sandybridge
+          zig build -Doptimize=ReleaseFast -Dtarget=x86_64-linux-gnu.2.17 -Dcpu=baseline
       - name: tests
         run: cd zig-out/bin && ./run.sh
       - uses: actions/upload-artifact@v3
@@ -46,7 +46,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Zig
-        uses: goto-bus-stop/setup-zig@d866436887ad1b24590684f9d00480376663dd36
+        uses: goto-bus-stop/setup-zig@2a9625d550eefc3a9b1a43d342ad655f563f8241
         with:
           version: 0.12.0
       - name: Set up emulation environment
@@ -74,7 +74,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Zig
-        uses: goto-bus-stop/setup-zig@d866436887ad1b24590684f9d00480376663dd36
+        uses: goto-bus-stop/setup-zig@2a9625d550eefc3a9b1a43d342ad655f563f8241
         with:
           version: 0.12.0
       - name: Set up emulation environment
@@ -98,7 +98,7 @@ jobs:
           name: build-linux-arm64
           path: zig-out/lib/libsodium.so
 
-  build-linux-musl:
+  build-linux-musl-x64:
     runs-on: ubuntu-latest
     container:
       image: alpine:3.13
@@ -108,26 +108,26 @@ jobs:
           apk update
           apk add alpine-sdk ca-certificates xz
       - name: Install Zig
-        uses: goto-bus-stop/setup-zig@d866436887ad1b24590684f9d00480376663dd36
+        uses: goto-bus-stop/setup-zig@2a9625d550eefc3a9b1a43d342ad655f563f8241
         with:
           version: 0.12.0
       - uses: actions/checkout@v3
       - name: build
         run: |
-          zig build -Doptimize=ReleaseFast -Dtarget=x86_64-linux-musl -Dcpu=sandybridge
+          zig build -Doptimize=ReleaseFast -Dtarget=x86_64-linux-musl -Dcpu=baseline
       - name: tests
         run: |
           cd zig-out/bin && ./run.sh
       - uses: actions/upload-artifact@v3
         with:
           name: build-linux-musl-x64
-          path: zig-out/lib/libsodium.so
+          path: zig-out/lib/libsodium.a
 
   build-linux-musl-arm:
     runs-on: ubuntu-latest
     steps:
       - name: Install Zig
-        uses: goto-bus-stop/setup-zig@d866436887ad1b24590684f9d00480376663dd36
+        uses: goto-bus-stop/setup-zig@2a9625d550eefc3a9b1a43d342ad655f563f8241
         with:
           version: 0.12.0
       - uses: actions/checkout@v3
@@ -137,13 +137,13 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: build-linux-musl-arm
-          path: zig-out/lib/libsodium.so
+          path: zig-out/lib/libsodium.a
 
   build-linux-musl-arm64:
     runs-on: ubuntu-latest
     steps:
       - name: Install Zig
-        uses: goto-bus-stop/setup-zig@d866436887ad1b24590684f9d00480376663dd36
+        uses: goto-bus-stop/setup-zig@2a9625d550eefc3a9b1a43d342ad655f563f8241
         with:
           version: 0.12.0
       - uses: actions/checkout@v3
@@ -153,7 +153,7 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: build-linux-musl-arm64
-          path: zig-out/lib/libsodium.so
+          path: zig-out/lib/libsodium.a
 
   build-macos-x64:
     runs-on: macos-latest
@@ -191,10 +191,10 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - build-windows
-      - build-linux-glibc
+      - build-linux-glibc-x64
       - build-linux-glibc-arm
       - build-linux-glibc-arm64
-      - build-linux-musl
+      - build-linux-musl-x64
       - build-linux-musl-arm
       - build-linux-musl-arm64
       - build-macos-x64