(GH:apache#267) (ci)(chore) Update to ubuntu-24.04-arm

Signed-off-by: Saurabh Kumar Singh <[email protected]>
singh1203 · Feb 5, 2025 · 5003605 · 5003605
1 parent b709be7
commit 5003605
Showing 1 changed file with 17 additions and 46 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -30,59 +30,30 @@ concurrency:
 permissions:
   contents: read
 jobs:
-  docker-targets:
-    name: Docker targets
-    runs-on: ubuntu-latest
-    outputs:
-      targets: ${{ steps.detect-targets.outputs.targets }}
-    steps:
-      - name: Detect targets
-        id: detect-targets
-        run: |
-          echo "targets<<JSON" >> "$GITHUB_OUTPUT"
-          echo "[" >> "$GITHUB_OUTPUT"
-          cat <<JSON >> "$GITHUB_OUTPUT"
-          {
-            "arch-label": "AMD64",
-            "arch": "amd64",
-            "go": "1.22",
-            "runs-on": "ubuntu-latest"
-          },
-          {
-            "arch-label": "AMD64",
-            "arch": "amd64",
-            "go": "1.23",
-            "runs-on": "ubuntu-latest"
-          }
-          JSON
-          if [ "$GITHUB_REPOSITORY_OWNER" = "apache" ]; then
-            echo "," >> "$GITHUB_OUTPUT"
-            cat <<JSON >> "$GITHUB_OUTPUT"
-          {
-            "arch-label": "ARM64",
-            "arch": "arm64v8",
-            "go": "1.22",
-            "runs-on": ["self-hosted", "arm", "linux"]
-          },
-          {
-            "arch-label": "ARM64",
-            "arch": "arm64v8",
-            "go": "1.23",
-            "runs-on": ["self-hosted", "arm", "linux"]
-          }
-          JSON
-          fi
-          echo "]" >> "$GITHUB_OUTPUT"
-          echo "JSON" >> "$GITHUB_OUTPUT"
   docker:
     name: ${{ matrix.arch-label }} Debian 12 Go ${{ matrix.go }}
-    needs: docker-targets
     runs-on: ${{ matrix.runs-on }}
     timeout-minutes: 30
     strategy:
       fail-fast: false
       matrix:
-        include: ${{ fromJson(needs.docker-targets.outputs.targets) }}
+        include:
+          - arch: amd64
+            go: 1.22
+            runs-on: ubuntu-latest
+            arch-label: AMD64
+          - arch: amd64
+            go: 1.23
+            runs-on: ubuntu-latest
+            arch-label: AMD64
+          - arch: arm64v8
+            go: 1.22
+            runs-on: ubuntu-24.04-arm
+            arch-label: ARM64
+          - arch: arm64v8
+            go: 1.23
+            runs-on: ubuntu-24.04-arm
+            arch-label: ARM64
     env:
       ARCH: ${{ matrix.arch }}
       GO: ${{ matrix.go }}