Use ARM64 runners for Github Action

phusion · Sep 17, 2024 · 47817dd · 47817dd
1 parent da25498
commit 47817dd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/.github/workflows/binaries.yml b/.github/workflows/binaries.yml
@@ -4,21 +4,21 @@ env:
   ENTERPRISE: 0
 
 on:
-  push:
-    branches: [ 'stable-*', 'feature/*' ]
-  pull_request:
-    branches: [ 'stable-*', 'feature/*' ]
+  push: {}
+  pull_request: {}
 
 jobs:
   build_linux:
     name: "Binary automation Linux-${{ matrix.arch }}"
     strategy:
       fail-fast: false
       matrix:
-        arch:
-          - x86_64
-          - aarch64
-    runs-on: ubuntu-latest
+        include:
+          - arch: x86_64
+            os: ubuntu-24.04
+          - arch: aarch64
+            os: ubuntu-24.04-arm64
+    runs-on: ${{ matrix.os }}
     env:
       WORKSPACE: ${{ github.workspace }}
       OUTPUT_DIR: ${{ github.workspace }}/output-linux-${{ matrix.arch }}
@@ -29,7 +29,6 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: true
-    - uses: docker/setup-qemu-action@v3
     - uses: docker/setup-buildx-action@v3
     - run: ./dev/ci/tests/binaries/build-linux
     - uses: actions/upload-artifact@v4

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -5,10 +5,8 @@ env:
   COMPILE_CONCURRENCY: 4
 
 on:
-  push:
-    branches: [ 'stable-*', 'feature/*' ]
-  pull_request:
-    branches: [ 'stable-*', 'feature/*' ]
+  push: {}
+  pull_request: {}
 
 jobs:
   cxx:

diff --git a/packaging/debian b/packaging/debian
+9 −9		internal/build/setup-environment.sh
+6 −1		internal/test/system_web_server_test.rb
+1 −1		internal/test/test.sh
+12 −1		test