Skip to content

Commit 534768c

Browse files
authored
[chore] update arm workflow to run both macos and linux (#10616)
Also updated the platform support doc. Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com>
1 parent c270bef commit 534768c

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.github/workflows/build-and-test-arm.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,11 @@ concurrency:
2222

2323
jobs:
2424
arm-unittest-matrix:
25+
strategy:
26+
matrix:
27+
os: [otel-linux-arm64, macos-14]
2528
if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run ARM') || github.event_name == 'push' || github.event_name == 'merge_group') }}
26-
runs-on: otel-linux-arm64
29+
runs-on: ${{ matrix.os }}
2730
steps:
2831
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
2932
- uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
@@ -49,7 +52,7 @@ jobs:
4952
run: make -j4 gotest
5053
arm-unittest:
5154
if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run ARM') || github.event_name == 'push' || github.event_name == 'merge_group') }}
52-
runs-on: otel-linux-arm64
55+
runs-on: ubuntu-latest
5356
needs: [arm-unittest-matrix]
5457
steps:
5558
- name: Print result

docs/platform-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ Tier 2 platforms are currently:
5050
| Platform | Owner(s) |
5151
|---------------|-------------------------------------------------------------------------------------------------------------|
5252
| darwin/arm64 | [@MovieStoreGuy](https://github.com/MovieStoreGuy) |
53+
| linux/arm64 | [@atoulme](https://github.com/atoulme) |
5354
| windows/amd64 | [OpenTelemetry Collector approvers](https://github.com/open-telemetry/opentelemetry-collector#contributing) |
5455

5556

@@ -63,7 +64,6 @@ Tier 3 platforms are currently:
6364
| darwin/amd64 | [@h0cheung](https://github.com/h0cheung) |
6465
| linux/386 | [@andrzej-stencel](https://github.com/andrzej-stencel) |
6566
| linux/arm | [@Wal8800](https://github.com/Wal8800), [@atoulme](https://github.com/atoulme) |
66-
| linux/arm64 | [@atoulme](https://github.com/atoulme) |
6767
| linux/ppc64le | [@IBM-Currency-Helper](https://github.com/IBM-Currency-Helper), [@adilhusain-s](https://github.com/adilhusain-s), [@seth-priya](https://github.com/seth-priya) |
6868
| linux/s390x | [@bwalk-at-ibm](https://github.com/bwalk-at-ibm), [@rrschulze](https://github.com/rrschulze) |
6969
| windows/386 | [@pjanotti](https://github.com/pjanotti) |

0 commit comments

Comments
 (0)