up

jedisct1 · Apr 27, 2024 · 388b5e9 · 388b5e9
1 parent 1e0d0e1
commit 388b5e9
Showing 1 changed file with 8 additions and 12 deletions.
diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
@@ -35,7 +35,7 @@ jobs:
 
       - name: build-windows-arm64
         run: |
-          rm -fr zig-out zig-cache; zig build -Doptimize=ReleaseFast -Dtarget=aarch64-windows
+          rm -fr zig-out zig-cache; zig build -Doptimize=ReleaseFast -Dtarget=aarch64-windows; ls -laR zig-out
       - uses: actions/upload-artifact@v3
         with:
           name: build-windows-arm64
@@ -51,15 +51,20 @@ jobs:
           name: build-linux-x64
           path: zig-out/lib/libsodium.so
 
-      - name: Set up arm emulation environment
+      - name: Set up arm and aarch64 emulation environment
         run: |
           export DEBIAN_FRONTEND=noninteractive
           sudo apt-get update
-          sudo apt-get install -y build-essential qemu binfmt-support qemu-user-static qemu-system-arm gcc-arm-linux-gnueabihf libc6-armhf-cross
+          sudo apt-get install -y build-essential qemu binfmt-support qemu-user-static qemu-system-arm gcc-arm-linux-gnueabihf libc6-armhf-cross gcc-aarch64-linux-gnu libc6-arm64-cross
           sudo dpkg --add-architecture armhf
           sudo update-binfmts --enable qemu-arm
           sudo update-binfmts --display
           sudo ln -s /usr/arm-linux-gnueabihf/lib/ld-linux-armhf.so.* /lib
+          sudo dpkg --add-architecture arm64
+          sudo update-binfmts --enable qemu-aarch64
+          sudo update-binfmts --display
+          sudo ln -s /usr/aarch64-linux-gnu/lib/ld-linux-aarch64.so.* /lib          
+
       - name: build-linux-arm
         run: |
           rm -fr zig-out zig-cache; zig build -Doptimize=ReleaseFast -Dtarget=arm-linux-gnueabihf.2.23
@@ -71,15 +76,6 @@ jobs:
           name: build-linux-arm
           path: zig-out/lib/libsodium.so
 
-      - name: Set up aarch64 emulation environment
-        run: |
-          export DEBIAN_FRONTEND=noninteractive
-          sudo apt-get update
-          sudo apt-get install -y qemu binfmt-support qemu-user-static qemu-system-arm gcc-aarch64-linux-gnu libc6-arm64-cross
-          sudo dpkg --add-architecture arm64
-          sudo update-binfmts --enable qemu-aarch64
-          sudo update-binfmts --display
-          sudo ln -s /usr/aarch64-linux-gnu/lib/ld-linux-aarch64.so.* /lib
       - name: build-linux-arm64
         run: |
           rm -fr zig-out zig-cache; zig build -Doptimize=ReleaseFast -Dtarget=aarch64-linux-gnu.2.23