chore: different arm runners

Author: MarcStdt

.github/workflows/build.yml

@@ -58,7 +58,6 @@ jobs:
           name: build-artifacts
       - name: Release
         uses: softprops/action-gh-release@v2
-        if: ${{ steps.version.outputs.version != '' }}
         with:
           tag_name: ${{ steps.version.outputs.version_tag }}
           prerelease: ${{ steps.version.outputs.increment != 0 }}
@@ -70,23 +69,36 @@ jobs:
             .docker/entrypoint.sh
             .docker/druid-install-command.sh
 
-  docker-base:
+  docker-base-amd64:
     needs: release
     uses: ./.github/workflows/docker-build-reusable.yml
     with:
       dockerfile: Dockerfile
       tag_suffix: ""
       version: ${{ needs.release.outputs.version }}
       version_tag: ${{ needs.release.outputs.version_tag }}
-      platforms: "linux/amd64,linux/arm64"
+      runs_on: "ubuntu-latest"
+    secrets:
+      DOCKERHUB_USERNAME: ${{ vars.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+      DRUID_ARTIFACTS_REGISTRY_USERNAME: ${{ vars.DRUID_ARTIFACTS_REGISTRY_USERNAME }}
+      DRUID_ARTIFACTS_REGISTRY_TOKEN: ${{ secrets.DRUID_ARTIFACTS_REGISTRY_TOKEN }}
+  docker-base-arm64:
+    needs: release
+    uses: ./.github/workflows/docker-build-reusable.yml
+    with:
+      dockerfile: Dockerfile
+      tag_suffix: ""
+      version: ${{ needs.release.outputs.version }}
+      version_tag: ${{ needs.release.outputs.version_tag }}
+      runs_on: "ubuntu-24.04-arm"
     secrets:
       DOCKERHUB_USERNAME: ${{ vars.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
       DRUID_ARTIFACTS_REGISTRY_USERNAME: ${{ vars.DRUID_ARTIFACTS_REGISTRY_USERNAME }}
       DRUID_ARTIFACTS_REGISTRY_TOKEN: ${{ secrets.DRUID_ARTIFACTS_REGISTRY_TOKEN }}
   docker-steamcmd:
-    needs: [release, docker-base]
-    if: ${{ needs.release.outputs.version != '' }}
+    needs: [release, docker-base-amd64, docker-base-arm64]
     uses: ./.github/workflows/docker-build-reusable.yml
     with:
       dockerfile: Dockerfile.steamcmd
@@ -98,9 +110,24 @@ jobs:
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
       DRUID_ARTIFACTS_REGISTRY_USERNAME: ${{ vars.DRUID_ARTIFACTS_REGISTRY_USERNAME }}
       DRUID_ARTIFACTS_REGISTRY_TOKEN: ${{ secrets.DRUID_ARTIFACTS_REGISTRY_TOKEN }}
-  docker-nix:
-    needs: [release, docker-base]
-    if: ${{ needs.release.outputs.version != '' }}
+  docker-nix-amd64:
+    needs: [release, docker-base-amd64, docker-base-arm64]
+    uses: ./.github/workflows/docker-build-reusable.yml
+    with:
+      dockerfile: Dockerfile.nix
+      tag_suffix: "-nix"
+      version: ${{ needs.release.outputs.version }}
+      version_tag: ${{ needs.release.outputs.version_tag }}
+      base_tag_suffix: ""
+      is_nix: true
+      runs_on: "ubuntu-latest"
+    secrets:
+      DOCKERHUB_USERNAME: ${{ vars.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+      DRUID_ARTIFACTS_REGISTRY_USERNAME: ${{ vars.DRUID_ARTIFACTS_REGISTRY_USERNAME }}
+      DRUID_ARTIFACTS_REGISTRY_TOKEN: ${{ secrets.DRUID_ARTIFACTS_REGISTRY_TOKEN }}
+  docker-nix-arm64:
+    needs: [release, docker-base-amd64, docker-base-arm64]
     uses: ./.github/workflows/docker-build-reusable.yml
     with:
       dockerfile: Dockerfile.nix
@@ -109,15 +136,14 @@ jobs:
       version_tag: ${{ needs.release.outputs.version_tag }}
       base_tag_suffix: ""
       is_nix: true
-      platforms: "linux/amd64,linux/arm64"
+      runs_on: "ubuntu-24.04-arm"
     secrets:
       DOCKERHUB_USERNAME: ${{ vars.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
       DRUID_ARTIFACTS_REGISTRY_USERNAME: ${{ vars.DRUID_ARTIFACTS_REGISTRY_USERNAME }}
       DRUID_ARTIFACTS_REGISTRY_TOKEN: ${{ secrets.DRUID_ARTIFACTS_REGISTRY_TOKEN }}
   docker-nix-steamcmd:
     needs: [release, docker-steamcmd]
-    if: ${{ needs.release.outputs.version != '' }}
     uses: ./.github/workflows/docker-build-reusable.yml
     with:
       dockerfile: Dockerfile.nix

.github/workflows/docker-build-reusable.yml

@@ -22,10 +22,10 @@ on:
                 required: false
                 type: boolean
                 default: false
-            platforms:
+            runs_on:
                 required: false
                 type: string
-                default: "linux/amd64"
+                default: "ubuntu-latest"
         secrets:
             DOCKERHUB_USERNAME:
                 required: true
@@ -38,7 +38,7 @@ on:
 
 jobs:
     build:
-        runs-on: ubuntu-latest
+        runs-on: ${{ inputs.runs_on }}
         steps:
             - uses: actions/checkout@v4
               with:
@@ -62,7 +62,6 @@ jobs:
               with:
                   context: .
                   file: ${{ inputs.dockerfile }}
-                  platforms: ${{ inputs.platforms }}
                   tags: |
                       highcard/druid:latest${{ inputs.tag_suffix }}
                       highcard/druid:stable${{ inputs.tag_suffix }}