Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .github/workflows/build-and-test-arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ jobs:
- name: Install dependencies
if: steps.go-setup.outputs.cache-hit != 'true'
run: make -j2 gomoddownload
- name: Install Tools
if: steps.go-setup.outputs.cache-hit != 'true'
run: make install-tools
arm-unittest-matrix:
needs: [setup-environment]
if: ${{ github.actor != 'dependabot[bot]' && (!contains(github.event.pull_request.labels.*.name, 'Skip ARM') || github.event_name == 'push' || github.event_name == 'merge_group') }}
Expand Down Expand Up @@ -129,5 +126,4 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
make install-tools
./.tools/issuegenerator -path ./internal/tools/testresults/ -labels "flaky tests,needs triage"
go -C ./internal/tools tool go.opentelemetry.io/build-tools/issuegenerator -path ./internal/tools/testresults/ -labels "flaky tests,needs triage"
3 changes: 0 additions & 3 deletions .github/workflows/build-and-test-darwin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ jobs:
- name: Install dependencies
if: steps.go-setup.outputs.cache-hit != 'true'
run: make -j2 gomoddownload
- name: Install Tools
if: steps.go-setup.outputs.cache-hit != 'true'
run: make install-tools
darwin-build-unittest-binary:
needs: [setup-environment]
if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run Darwin') || github.event_name == 'push' || github.event_name == 'merge_group') }}
Expand Down
20 changes: 5 additions & 15 deletions .github/workflows/build-and-test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ jobs:
- name: Install dependencies
if: steps.go-setup.outputs.cache-hit != 'true'
run: make -j2 gomoddownload
- name: Install Tools
if: steps.go-setup.outputs.cache-hit != 'true'
run: make install-tools

windows-smoke-build:
needs: [setup-environment]
Expand All @@ -63,9 +60,6 @@ jobs:
- name: Install dependencies
if: steps.go-setup.outputs.cache-hit != 'true'
run: make -j2 gomoddownload
- name: Install Tools
if: steps.go-setup.outputs.cache-hit != 'true'
run: make install-tools
- name: Generate nrdotcol files
run: make gennrdotcol
- name: Build Collector
Expand Down Expand Up @@ -106,11 +100,11 @@ jobs:
- name: Ensure required ports in the dynamic range are available
run: |
& ${{ github.workspace }}\.github\workflows\scripts\win-required-ports.ps1
- name: Build shared test tools
# If component tests share Makefile targets they need to be added here to avoid
# concurrent component tests clashing when building such targets. This applies
- name: Pre-build shared test tools
# Pre-warms the go tool cache for gotestsum to avoid concurrent builds when
# multiple test matrix jobs start simultaneously on Windows.
# specifically to Windows, see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/34691
run: make "$(${PWD} -replace '\\', '/')/.tools/gotestsum"
run: go -C ./internal/tools tool -n gotest.tools/gotestsum | Out-Null

# Unit tests without JUnit output are much faster, so it's fine to run on every PR.
# The only time we don't run them is when we already ran them with JUnit output.
Expand Down Expand Up @@ -179,9 +173,6 @@ jobs:
- name: Install dependencies
if: steps.go-setup.outputs.cache-hit != 'true'
run: make -j2 gomoddownload
- name: Install Tools
if: steps.go-setup.outputs.cache-hit != 'true'
run: make install-tools
- uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6
with:
merge-multiple: true
Expand All @@ -191,5 +182,4 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
make install-tools
./.tools/issuegenerator -path ./internal/tools/testresults/ -labels "flaky tests,needs triage"
go -C ./internal/tools tool go.opentelemetry.io/build-tools/issuegenerator -path ./internal/tools/testresults/ -labels "flaky tests,needs triage"
27 changes: 0 additions & 27 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@ jobs:
- name: Install dependencies
if: steps.go-setup.outputs.cache-hit != 'true'
run: make -j2 gomoddownload
- name: Install Tools
if: steps.go-setup.outputs.cache-hit != 'true'
run: make install-tools
check-collector-module-version:
runs-on: ubuntu-24.04
needs: [setup-environment]
Expand Down Expand Up @@ -93,9 +90,6 @@ jobs:
- name: Install dependencies
if: steps.go-setup.outputs.cache-hit != 'true'
run: make -j2 gomoddownload
- name: Install Tools
if: steps.go-setup.outputs.cache-hit != 'true'
run: make install-tools
- name: Fetch commit history up to date of fork
run: git fetch origin main --shallow-since=2025-11-18
- name: Lint
Expand Down Expand Up @@ -143,9 +137,6 @@ jobs:
- name: Install dependencies
if: steps.go-setup.outputs.cache-hit != 'true'
run: make -j2 gomoddownload
- name: Install Tools
if: steps.go-setup.outputs.cache-hit != 'true'
run: make install-tools
- name: Run `govulncheck`
run: |
out=$(mktemp)
Expand All @@ -167,9 +158,6 @@ jobs:
- name: Install dependencies
if: steps.go-setup.outputs.cache-hit != 'true'
run: make -j2 gomoddownload
- name: Install Tools
if: steps.go-setup.outputs.cache-hit != 'true'
run: make install-tools
- run: make gennrdotcol
- name: Check Component Files
run: make check-component-files
Expand Down Expand Up @@ -247,9 +235,6 @@ jobs:
- name: Install dependencies
if: steps.go-setup.outputs.cache-hit != 'true'
run: make -j2 gomoddownload
- name: Install Tools
if: steps.go-setup.outputs.cache-hit != 'true'
run: make install-tools
- name: Cache Test Build
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
with:
Expand Down Expand Up @@ -401,9 +386,6 @@ jobs:
- name: Install dependencies
if: steps.go-setup.outputs.cache-hit != 'true'
run: make -j2 gomoddownload
- name: Install Tools
if: steps.go-setup.outputs.cache-hit != 'true'
run: make install-tools
- name: Correctness
run: make -C testbed run-correctness-traces-tests
correctness-metrics:
Expand All @@ -420,9 +402,6 @@ jobs:
- name: Install dependencies
if: steps.go-setup.outputs.cache-hit != 'true'
run: make -j2 gomoddownload
- name: Install Tools
if: steps.go-setup.outputs.cache-hit != 'true'
run: make install-tools
- name: Correctness
run: make -C testbed run-correctness-metrics-tests

Expand Down Expand Up @@ -478,9 +457,6 @@ jobs:
- name: Install dependencies
if: steps.go-setup.outputs.cache-hit != 'true'
run: make -j2 gomoddownload
- name: Install Tools
if: steps.go-setup.outputs.cache-hit != 'true'
run: make install-tools
- name: Generate collector files
run: make gennrdotcol
- name: Build Collector ${{ matrix.os }} ${{ matrix.arch }} ${{ matrix.arm }}
Expand Down Expand Up @@ -526,9 +502,6 @@ jobs:
- name: Install dependencies
if: steps.go-setup.outputs.cache-hit != 'true'
run: make -j2 gomoddownload
- name: Install Tools
if: steps.go-setup.outputs.cache-hit != 'true'
run: make install-tools
- name: Build Docker Image
run: |
make gennrdotcol
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/check-codeowners.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@ jobs:
go-version: oldstable
cache-dependency-path: "**/*.sum"

- name: Install tools
run: |
make install-tools

- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
with:
ref: ${{github.event.pull_request.head.ref}}
Expand All @@ -56,5 +52,5 @@ jobs:
- name: Gen CODEOWNERS
run: |
cd pr
GITHUB_TOKEN=${{ secrets.OTELCOMBOT_TOKEN }} ../.tools/githubgen --default-codeowner="@newrelic/otelcomm" --github-org="newrelic" codeowners
GITHUB_TOKEN=${{ secrets.OTELCOMBOT_TOKEN }} go -C ../internal/tools tool go.opentelemetry.io/build-tools/githubgen --default-codeowner="@newrelic/otelcomm" --github-org="newrelic" codeowners
git diff -s --exit-code || (echo 'Generated code is out of date, please run "make gencodeowners" or apply this diff and commit the changes in this PR.' && git diff && exit 1)
3 changes: 0 additions & 3 deletions .github/workflows/e2e-tests-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ jobs:
- name: Install dependencies
if: steps.go-setup.outputs.cache-hit != 'true'
run: make -j2 gomoddownload
- name: Install Tools
if: steps.go-setup.outputs.cache-hit != 'true'
run: make install-tools
- name: Generate otelcontribcol files
run: make gennrdotcol
- name: Build Collector
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/lint-workflow-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ jobs:
- name: Install dependencies
if: steps.go-setup.outputs.cache-hit != 'true'
run: make -j2 gomoddownload
- name: Install Tools
if: steps.go-setup.outputs.cache-hit != 'true'
run: make install-tools

- name: Run Actionlint
run: |
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/scoped-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,6 @@ jobs:
- name: Install dependencies
if: steps.go-setup.outputs.cache-hit != 'true'
run: make -j2 gomoddownload
- name: Install Tools
if: steps.go-setup.outputs.cache-hit != 'true'
run: make install-tools

- name: Build gotestsum
shell: bash
run: make "$PWD/.tools/gotestsum"

- name: Run changed tests
if: needs.changedfiles.outputs.go_tests
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/tidy-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ jobs:
- name: Install dependencies
if: steps.go-setup.outputs.cache-hit != 'true'
run: make -j2 gomoddownload
- name: Install Tools
if: steps.go-setup.outputs.cache-hit != 'true'
run: make install-tools
- name: Import GPG key
uses: crazy-max/ghaction-import-gpg@e89d40939c28e39f97cf32126055eeae86ba74ec # v6
with:
Expand Down
Loading
Loading