Skip to content

Commit ae34b4f

Browse files
ci: add native arm64 GHA runner support (#1066)
1 parent c31d5d1 commit ae34b4f

File tree

4 files changed

+214
-67
lines changed

4 files changed

+214
-67
lines changed

.github/workflows/make-agent.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@ jobs:
4040
path: php-agent
4141
repository: ${{ inputs.origin }}/newrelic-php-agent
4242
ref: ${{ inputs.ref }}
43-
- name: Enable arm64 emulation
44-
if: ${{ inputs.arch == 'arm64' }}
45-
uses: docker/setup-qemu-action@v3
46-
with:
47-
image: tonistiigi/binfmt:${{vars.BINFMT_IMAGE_VERSION}}
48-
platforms: arm64
4943
- name: Login to Docker Hub
5044
uses: docker/login-action@v3
5145
with:

.github/workflows/make-integration-tests.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,6 @@ jobs:
5656
run: |
5757
chmod 755 php-agent/bin/integration_runner
5858
chmod 755 php-agent/agent/modules/newrelic.so
59-
- name: Enable arm64 emulation
60-
if: ${{ inputs.arch == 'arm64' }}
61-
uses: docker/setup-qemu-action@v3
62-
with:
63-
image: tonistiigi/binfmt:${{vars.BINFMT_IMAGE_VERSION}}
64-
platforms: arm64
6559
- name: Login to Docker Hub
6660
uses: docker/login-action@v3
6761
with:

.github/workflows/run-integration-tests.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,11 @@ on:
2121
runner-type:
2222
description: 'Type of a runner to use for integration tests on arm64'
2323
required: true
24-
default: 'ubuntu-20.04-4core'
24+
default: 'ubuntu-24.04-arm'
2525
type: choice
2626
options:
27-
- ubuntu-20.04-4core
28-
- ubuntu-20.04-8core
29-
- ubuntu-20.04-16core
30-
- ubuntu-22.04-4core
31-
- ubuntu-latest
27+
- ubuntu-22.04-arm
28+
- ubuntu-24.04-arm
3229

3330
jobs:
3431
build-test-runner-amd64:
@@ -55,7 +52,7 @@ jobs:
5552
artifact-name: integration_runner
5653
artifact-pattern: bin/integration_runner
5754
arch: arm64
58-
runs-on: ubuntu-latest
55+
runs-on: ${{inputs.runner-type}}
5956
secrets: inherit
6057

6158
build-agent-amd64:
@@ -72,7 +69,7 @@ jobs:
7269
origin: ${{ inputs.origin }}
7370
ref: ${{ inputs.ref }}
7471
arch: arm64
75-
runs-on: ubuntu-latest
72+
runs-on: ${{inputs.runner-type}}
7673
secrets: inherit
7774

7875
test-amd64:

0 commit comments

Comments
 (0)