Switch ARM64 build from qemu to native runner (#108) (#111)

elastic · Oct 24, 2024 · 1a349af · 1a349af
1 parent 81c856d
commit 1a349af
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/build-arch-matrix-generator.yml b/.github/workflows/build-arch-matrix-generator.yml
@@ -34,7 +34,7 @@ jobs:
           fi
           if [ "${SELECTED_ARCH}" == "arm64" ] ||  [ "${SELECTED_ARCH}" == "all" ]; then
             echo "${SELECTED_ARCH} selected. Adding arm64"
-            MATRIX+='{"arch": "linux-arm64", "run_qemu": 1, "goarch": "arm64", "packages": "deb rpm"},{"arch": "linuxmusl-arm64", "run_qemu": 1, "goarch": "arm64", "packages": "apk"},'
+            MATRIX+='{"arch": "linux-arm64", "goarch": "arm64", "packages": "deb rpm"},{"arch": "linuxmusl-arm64", "goarch": "arm64", "packages": "apk"},'
           fi
           echo "matrix-combinations={\"include\":[$MATRIX]}"
 

diff --git a/.github/workflows/build-native.yml b/.github/workflows/build-native.yml
@@ -29,7 +29,7 @@ jobs:
 
   build-native:
     name: build-agent-library
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.goarch == 'arm64' && 'observability-linux-2-arm64' || 'ubuntu-latest' }}
     needs: setup-build-matrix
     timeout-minutes: 300
     strategy:
@@ -39,10 +39,10 @@ jobs:
       BUILD_ARCHITECTURE: ${{ matrix.arch }}
     steps:
       - uses: actions/checkout@v4
-      - if: ${{ matrix.run_qemu }}
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: arm64
+      # - if: ${{ matrix.goarch == 'arm64' }}
+      #   uses: docker/setup-qemu-action@v3
+      #   with:
+      #     platforms: arm64
       - name: Build
         run: |
           uname -a

diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
@@ -29,7 +29,7 @@ jobs:
 
   build-packages:
     name: build-packages
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.goarch == 'arm64' && 'observability-linux-2-arm64' || 'ubuntu-latest' }}
     needs: setup-build-matrix
     timeout-minutes: 300
     strategy:
@@ -39,10 +39,10 @@ jobs:
       BUILD_ARCHITECTURE: ${{ matrix.arch }}
     steps:
       - uses: actions/checkout@v4
-      - if: ${{ matrix.run_qemu }}
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: arm64
+      # - if: ${{ matrix.goarch == 'arm64' }}
+      #   uses: docker/setup-qemu-action@v3
+      #   with:
+      #     platforms: arm64
       - uses: actions/download-artifact@v4
         with:
           name: build-native-${{ matrix.arch }}

diff --git a/.github/workflows/test-phpt.yml b/.github/workflows/test-phpt.yml
@@ -29,7 +29,7 @@ jobs:
 
   test-phpt:
     name: test-phpt
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.goarch == 'arm64' && 'observability-linux-2-arm64' || 'ubuntu-latest' }}
     needs: setup-build-matrix
     timeout-minutes: 300
     strategy:
@@ -43,10 +43,10 @@ jobs:
         with:
           name: build-native-${{ matrix.arch }}
           path: prod/native/_build/${{ matrix.arch }}-release/
-      - if: ${{ matrix.run_qemu }}
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: arm64
+      # - if: ${{ matrix.goarch == 'arm64' }}
+      #   uses: docker/setup-qemu-action@v3
+      #   with:
+      #     platforms: arm64
       - name: Run phpt tests
         run: |
           uname -a