Use otel-linux-arm64 for the generate and test CI, instead of macos (#…

…1529) * use otel-linux-arm64 for the generate and test CI, instead of macos * preserve PATH when running test-ebpf --------- Co-authored-by: Tyler Yahn <[email protected]>
open-telemetry · Jan 5, 2025 · 9b7f238 · 9b7f238
1 parent 9a4cbc8
commit 9b7f238
Showing 1 changed file with 6 additions and 26 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -9,8 +9,11 @@ env:
   GO_VERSION: "~1.23.1"
 
 jobs:
-  generate-and-test-x86_64:
-    runs-on: ubuntu-latest
+  generate-and-test:
+    strategy:
+      matrix:
+        os: [ ubuntu-latest, otel-linux-arm64]
+    runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout Repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -27,30 +30,7 @@ jobs:
           uname -p;
           clang --version;
       - run: make test
-      - run: sudo make test-ebpf
-      - run: make check-clean-work-tree
-  generate-and-test-arm64:
-    runs-on: macos-latest
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - name: Setup Go
-        uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5
-        with:
-          go-version: ${{ env.GO_VERSION }}
-          check-latest: true
-          cache-dependency-path: "**/go.sum"
-      - name: Install build dependencies
-        run: |
-          brew update && brew install llvm
-          echo "PATH=/opt/homebrew/opt/llvm/bin:$PATH" >> $GITHUB_ENV;
-          echo "LDFLAGS=-L/opt/homebrew/opt/llvm/lib -L/opt/homebrew/opt/llvm/lib/c++ -Wl,-rpath,/opt/homebrew/opt/llvm/lib/c++" >> $GITHUB_ENV;
-          echo "CPPFLAGS=-I/opt/homebrew/opt/llvm/include" >> $GITHUB_ENV;
-      - name: Architecture
-        run: |
-          uname -p;
-          clang --version;
-      - run: make test
+      - run: sudo --preserve-env=PATH make test-ebpf
       - run: make check-clean-work-tree
   docker-build:
     runs-on: ubuntu-latest