From 78e5c9d367ba9bec09dd7aa60576cb8a362fe052 Mon Sep 17 00:00:00 2001
From: KubaZ2 <jazloty@o2.pl>
Date: Thu, 10 Oct 2024 23:17:27 +0200
Subject: [PATCH] Fix CI for arm64

---
 .github/workflows/dotnet.yml | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 1dbf832..74c3610 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -59,6 +59,17 @@ jobs:
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
 
+    - name: Build and push bot
+      uses: docker/bake-action@v5
+      with:
+        source: .
+        workdir: Bot
+        push: true
+        set: |
+          *.platform=linux/amd64,linux/arm64
+          *.cache-from=type=gha
+          *.cache-to=type=gha,mode=min
+
     - name: Check if checked runtime changed
       uses: dorny/paths-filter@v3
       id: checkedruntime
@@ -66,6 +77,13 @@ jobs:
         filters: |
           checkedruntime:
             - 'Backend/Sandbox/CheckedRuntime/**'
+            - '.github/workflows/**'
+
+    - name: Set MINUS_PREFIXED_PLATFORM_IF_NOT_AMD64
+      if: steps.checkedruntime.outputs.checkedruntime == 'true'
+      run: |
+        MINUS_PREFIXED_PLATFORM_IF_NOT_AMD64=${{ runner.arch != 'X64' && format('-{0}', runner.arch) || '' }}
+        echo "MINUS_PREFIXED_PLATFORM_IF_NOT_AMD64=${MINUS_PREFIXED_PLATFORM_IF_NOT_AMD64,,}" >>${GITHUB_ENV}
 
     - name: Build and push checked runtime
       if: steps.checkedruntime.outputs.checkedruntime == 'true'
@@ -78,22 +96,7 @@ jobs:
           *.platform=linux/amd64,linux/arm64
           *.cache-from=type=gha
           *.cache-to=type=gha,mode=min
-
-    - name: Build and push bot
-      uses: docker/bake-action@v5
-      with:
-        source: .
-        workdir: Bot
-        push: true
-        set: |
-          *.platform=linux/amd64,linux/arm64
-          *.cache-from=type=gha
-          *.cache-to=type=gha,mode=min
-
-    - name: Set MINUS_PREFIXED_PLATFORM_IF_NOT_AMD64
-      run: |
-        MINUS_PREFIXED_PLATFORM_IF_NOT_AMD64=${{ runner.arch != 'X64' && format('-{0}', runner.arch) || '' }}
-        echo "MINUS_PREFIXED_PLATFORM_IF_NOT_AMD64=${MINUS_PREFIXED_PLATFORM_IF_NOT_AMD64,,}" >>${GITHUB_ENV}
+          checked-runtime.args.MINUS_PREFIXED_PLATFORM_IF_NOT_AMD64=${{ env.MINUS_PREFIXED_PLATFORM_IF_NOT_AMD64 }}
 
     - name: Build and push backend
       uses: docker/bake-action@v5
@@ -105,4 +108,3 @@ jobs:
           *.platform=linux/amd64,linux/arm64
           *.cache-from=type=gha
           *.cache-to=type=gha,mode=min
-          asm.args.MINUS_PREFIXED_PLATFORM_IF_NOT_AMD64=${{ env.MINUS_PREFIXED_PLATFORM_IF_NOT_AMD64 }}