From 375c2fe708e75fc1b503f63965ad19856e2846f5 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Wed, 16 Oct 2024 09:28:19 -0700 Subject: [PATCH] [chore] do not run macos 14 twice ; do not use actuated proxy (#35755) Small fixes to how we run the arm and mac OS builds. Co-authored-by: Pablo Baeyens --- .github/workflows/build-and-test-arm.yml | 5 ++--- .github/workflows/build-and-test-darwin.yaml | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-test-arm.yml b/.github/workflows/build-and-test-arm.yml index f109e8e1664c..285a79e222aa 100644 --- a/.github/workflows/build-and-test-arm.yml +++ b/.github/workflows/build-and-test-arm.yml @@ -26,7 +26,6 @@ jobs: strategy: fail-fast: false matrix: - os: [otel-linux-arm64, macos-14] group: - receiver-0 - receiver-1 @@ -46,7 +45,7 @@ jobs: - cmd-1 - other timeout-minutes: 30 - runs-on: ${{ matrix.os }} + runs-on: otel-linux-arm64 steps: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 @@ -61,7 +60,7 @@ jobs: path: | ~/go/bin ~/go/pkg/mod - key: go-build-cache-${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} + key: go-build-cache-otel-linux-arm64-go-${{ hashFiles('**/go.sum') }} - name: Install dependencies if: steps.go-cache.outputs.cache-hit != 'true' run: make -j2 gomoddownload diff --git a/.github/workflows/build-and-test-darwin.yaml b/.github/workflows/build-and-test-darwin.yaml index 02aea07e37a0..6ae971b84192 100644 --- a/.github/workflows/build-and-test-darwin.yaml +++ b/.github/workflows/build-and-test-darwin.yaml @@ -14,7 +14,6 @@ env: # Make sure to exit early if cache segment download times out after 2 minutes. # We limit cache download as a whole to 5 minutes. SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2 - GOPROXY: https://goproxy1.cncf.selfactuated.dev,direct # Do not cancel this workflow on main. See https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/16616 concurrency: