Skip to content

Commit 1c821c3

Browse files
committed
X-Smart-Squash: Squashed 6 commits:
795ddf9185 Add arm64 runner to go unit-tests 18d13aaa7a update 1a77441558 runner 21fc418719 combine 8eff5ea9db update proto a1f9b03af8 skip junit2jira on arm64
1 parent 2678163 commit 1c821c3

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

.github/workflows/unit-tests.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
gotags: [ 'GOTAGS=""', 'GOTAGS=release' ]
20-
runs-on: ubuntu-latest
20+
arch: [amd64, arm64]
21+
runs-on: ${{ (matrix.arch == 'arm64' && 'ubuntu-24.04-arm') || 'ubuntu-24.04' }}
2122
outputs:
2223
new-jiras: ${{ steps.junit2jira.outputs.new-jiras }}
2324
container:
@@ -39,7 +40,8 @@ jobs:
3940
uses: ./.github/actions/cache-go-dependencies
4041

4142
- name: Go Unit Tests
42-
run: ${{ matrix.gotags }} make go-unit-tests
43+
run: |
44+
${{ matrix.gotags }} make go-unit-tests
4345
4446
- uses: codecov/codecov-action@v3
4547
with:
@@ -73,7 +75,7 @@ jobs:
7375
paths: 'junit-reports/report.xml'
7476

7577
- name: Report test failures to Jira
76-
if: (!cancelled())
78+
if: (!cancelled()) && matrix.arch != 'arm64' # junit2jira needs arm release
7779
id: junit2jira
7880
uses: ./.github/actions/junit2jira
7981
with:

make/protogen.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ endif
5757
ifeq ($(UNAME_S),Darwin)
5858
PROTOC_OS = osx
5959
endif
60-
PROTOC_ARCH=$(shell case $$(uname -m) in (arm64) echo aarch_64 ;; (s390x) echo s390_64 ;; (*) uname -m ;; esac)
60+
PROTOC_ARCH=$(shell case $$(uname -m) in (arm64|aarch64) echo aarch_64 ;; (s390x) echo s390_64 ;; (*) uname -m ;; esac)
6161

6262
PROTO_PRIVATE_DIR := $(BASE_PATH)/.proto
6363

0 commit comments

Comments
 (0)