feat(ci): use aarch64-linux runnner

SoftVarE-Group · Jan 26, 2025 · 73ccdf3 · 73ccdf3
1 parent 3744c9b
commit 73ccdf3
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 37 deletions.
diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
@@ -22,19 +22,14 @@ jobs:
       matrix:
         target:
           - double: aarch64-linux                   # target we are building for
-            system: aarch64-linux                   # system we are building on
-            emulated: true                          # whether this build is being emulated
-            runner: ubuntu-24.04                    # GitHub runner the build is running on
+            runner: ubuntu-24.04-arm                # GitHub runner the build is running on
             interpreter: /lib/ld-linux-aarch64.so.1 # path to libc interpreter
           - double: x86_64-linux
-            system: x86_64-linux
             runner: ubuntu-24.04
             interpreter: /lib64/ld-linux-x86-64.so.2
           - double: x86_64-darwin
-            system: x86_64-darwin
             runner: macos-13
           - double: aarch64-darwin
-            system: aarch64-darwin
             runner: macos-15
         variant:
           - flake: ddnnife
@@ -47,29 +42,24 @@ jobs:
           - target: { double: aarch64-linux }
             variant: { flake: ddnnife }
         include:
-          - target: { double: aarch64-linux, system: aarch64-linux, emulated: true, runner: ubuntu-24.04 }
+          - target: { double: aarch64-linux, runner: ubuntu-24.04-arm }
             variant: { flake: ddnnife-static, artifact: '' }
-          - target: { double: x86_64-linux, system: x86_64-linux, runner: ubuntu-24.04 }
+          - target: { double: x86_64-linux, runner: ubuntu-24.04 }
             variant: { flake: ddnnife-static, artifact: '' }
-          - target: { double: x86_64-windows, system: x86_64-linux, runner: ubuntu-24.04 }
+          - target: { double: x86_64-windows, runner: ubuntu-24.04 }
             variant: { flake: ddnnife-windows, artifact: '' }
-          - target: { double: x86_64-windows, system: x86_64-linux, runner: ubuntu-24.04 }
+          - target: { double: x86_64-windows, runner: ubuntu-24.04 }
             variant: { flake: ddnnife-windows-d4-bundled, artifact: '-d4' }
     runs-on: ${{ matrix.target.runner }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: QEMU
-        if: ${{ matrix.target.emulated }}
-        run: sudo apt-get install -y qemu-user-static
       - name: Nix
         uses: DeterminateSystems/nix-installer-action@v16
-        with:
-          extra-conf: extra-platforms = ${{ matrix.target.system }}
       - name: Cache
-        uses: DeterminateSystems/magic-nix-cache-action@v8
+        uses: DeterminateSystems/magic-nix-cache-action@v9
       - name: Build
-        run: nix build -L .#packages.${{ matrix.target.system }}.${{ matrix.variant.flake }}
+        run: nix build -L .#${{ matrix.variant.flake }}
       - name: Set interpreter
         if: ${{ matrix.target.interpreter }}
         run: |

diff --git a/.github/workflows/Container.yaml b/.github/workflows/Container.yaml
@@ -13,26 +13,22 @@ jobs:
     strategy:
       matrix:
         target:
-          - double: aarch64-linux # target we are building for
-            architecture: arm64   # container architecture label
-            emulated: true        # whether this build is being emulated
+          - double: aarch64-linux    # target we are building for
+            architecture: arm64      # container architecture label
+            runner: ubuntu-24.04-arm # GitHub runner the build is running on
           - double: x86_64-linux
             architecture: amd64
-    runs-on: ubuntu-24.04
+            runner: ubuntu-24.04
+    runs-on: ${{ matrix.target.runner }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: QEMU
-        if: ${{ matrix.target.emulated }}
-        run: sudo apt-get install -y qemu-user-static
       - name: Nix
         uses: DeterminateSystems/nix-installer-action@v16
-        with:
-          extra-conf: extra-platforms = ${{ matrix.target.double }}
       - name: Cache
-        uses: DeterminateSystems/magic-nix-cache-action@v8
+        uses: DeterminateSystems/magic-nix-cache-action@v9
       - name: Build
-        run: nix build -L .#packages.${{ matrix.target.double }}.container
+        run: nix build -L .#container
       - name: Login
         run: nix run nixpkgs#skopeo -- login $REGISTRY --username ${{ github.actor }} --password ${{ secrets.GITHUB_TOKEN }}
       - name: Push

diff --git a/.github/workflows/Kotlin.yaml b/.github/workflows/Kotlin.yaml
@@ -11,8 +11,7 @@ jobs:
         target:
           - double: aarch64-linux
             jna: linux-aarch64
-            runner: ubuntu-24.04
-            emulated: true
+            runner: ubuntu-24.04-arm
           - double: x86_64-linux
             jna: linux-x86-64
             runner: ubuntu-24.04
@@ -34,15 +33,10 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: QEMU
-        if: ${{ matrix.target.emulated }}
-        run: sudo apt-get install -y qemu-user-static
       - name: Nix
         uses: DeterminateSystems/nix-installer-action@v16
-        with:
-          extra-conf: extra-platforms = ${{ matrix.target.double }}
       - name: Cache
-        uses: DeterminateSystems/magic-nix-cache-action@v8
+        uses: DeterminateSystems/magic-nix-cache-action@v9
       - name: Build
         run: |
           nix build -L .#packages.${{ matrix.target.double }}.libddnnife${{ matrix.variant.flake }}

diff --git a/.github/workflows/Python.yaml b/.github/workflows/Python.yaml
@@ -11,6 +11,8 @@ jobs:
         target:
           - double: x86_64-linux
             runner: ubuntu-24.04
+          - double: aarch64-linux
+            runner: ubuntu-24.04-arm
           - double: x86_64-darwin
             runner: macos-13
           - double: aarch64-darwin
@@ -22,7 +24,7 @@ jobs:
       - name: Nix
         uses: DeterminateSystems/nix-installer-action@v16
       - name: Cache
-        uses: DeterminateSystems/magic-nix-cache-action@v8
+        uses: DeterminateSystems/magic-nix-cache-action@v9
       - name: Build
         run: nix build -L .#python
       - name: Upload