From 534768cf7a80edd935a75954043923b7bbe6efdc Mon Sep 17 00:00:00 2001
From: Alex Boten <223565+codeboten@users.noreply.github.com>
Date: Mon, 15 Jul 2024 13:32:12 -0700
Subject: [PATCH] [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>
---
 .github/workflows/build-and-test-arm.yml | 7 +++++--
 docs/platform-support.md                 | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-and-test-arm.yml b/.github/workflows/build-and-test-arm.yml
index a490105715e..ed9b0759e16 100644
--- a/.github/workflows/build-and-test-arm.yml
+++ b/.github/workflows/build-and-test-arm.yml
@@ -22,8 +22,11 @@ concurrency:
 
 jobs:
   arm-unittest-matrix:
+    strategy:
+      matrix:
+        os: [otel-linux-arm64, macos-14]
     if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run ARM') || github.event_name == 'push' || github.event_name == 'merge_group') }}
-    runs-on: otel-linux-arm64
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
@@ -49,7 +52,7 @@ jobs:
         run: make -j4 gotest
   arm-unittest:
     if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run ARM') || github.event_name == 'push' || github.event_name == 'merge_group') }}
-    runs-on: otel-linux-arm64
+    runs-on: ubuntu-latest
     needs: [arm-unittest-matrix]
     steps:
       - name: Print result
diff --git a/docs/platform-support.md b/docs/platform-support.md
index edcd430357f..4938b13b8f6 100644
--- a/docs/platform-support.md
+++ b/docs/platform-support.md
@@ -50,6 +50,7 @@ Tier 2 platforms are currently:
 | Platform      | Owner(s)                                                                                                    |
 |---------------|-------------------------------------------------------------------------------------------------------------|
 | darwin/arm64  | [@MovieStoreGuy](https://github.com/MovieStoreGuy)                                                          |
+| linux/arm64   | [@atoulme](https://github.com/atoulme)                                                                      |
 | windows/amd64 | [OpenTelemetry Collector approvers](https://github.com/open-telemetry/opentelemetry-collector#contributing) |
 
 
@@ -63,7 +64,6 @@ Tier 3 platforms are currently:
 | darwin/amd64  | [@h0cheung](https://github.com/h0cheung)                                                                                                                        |
 | linux/386     | [@andrzej-stencel](https://github.com/andrzej-stencel)                                                                                                          |
 | linux/arm     | [@Wal8800](https://github.com/Wal8800), [@atoulme](https://github.com/atoulme)                                                                                  |
-| linux/arm64   | [@atoulme](https://github.com/atoulme)                                                                                                                          |
 | 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)  |
 | linux/s390x   | [@bwalk-at-ibm](https://github.com/bwalk-at-ibm), [@rrschulze](https://github.com/rrschulze)                                                                    |
 | windows/386   | [@pjanotti](https://github.com/pjanotti)                                                                                                                        |