Skip to content

Commit

Permalink
[chore] do not run macos 14 twice ; do not use actuated proxy (#35755)
Browse files Browse the repository at this point in the history
Small fixes to how we run the arm and mac OS builds.

Co-authored-by: Pablo Baeyens <[email protected]>
  • Loading branch information
atoulme and mx-psi authored Oct 16, 2024
1 parent 12a8df8 commit 375c2fe
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/build-and-test-arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [otel-linux-arm64, macos-14]
group:
- receiver-0
- receiver-1
Expand All @@ -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
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/build-and-test-darwin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 375c2fe

Please sign in to comment.