Skip to content

Commit d9668be

Browse files
authored
feat: remove hardcoded version of go in GitHub Actions workflows (#1839)
* feat: use go version from collector go.mod * fix: print go version * fix: go version is already in the output
1 parent 0569e6b commit d9668be

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

.github/workflows/ci-collector.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2525
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
2626
with:
27-
go-version: '~1.21.9'
27+
go-version-file: collector/go.mod
2828
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
2929
with:
3030
path: ~/go/pkg/mod
@@ -47,7 +47,7 @@ jobs:
4747
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4848
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
4949
with:
50-
go-version: '~1.21.9'
50+
go-version-file: collector/go.mod
5151
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
5252
with:
5353
path: ~/go/pkg/mod

.github/workflows/publish-layer-collector.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
- name: Setup Go
7979
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
8080
with:
81-
go-version: '~1.21.9'
81+
go-version-file: collector/go.mod
8282
- name: Build Collector
8383
run: |
8484
if [[ -n "${{ inputs.build-tags }}" ]]; then

.github/workflows/release-layer-collector.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3838
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
3939
with:
40-
go-version: '^1.24.2'
40+
go-version-file: collector/go.mod
4141
- name: build
4242
run: make -C collector package GOARCH=${{ matrix.architecture }}
4343
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2

collector/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ clean:
3434

3535
.PHONY: build
3636
build: clean set-otelcol-version
37-
@echo Building otel collector extension
37+
@echo Building otel collector extension, $(shell go version)
3838
mkdir -p $(BUILD_SPACE)/extensions
3939
GOOS=linux GOARCH=$(GOARCH) $(GOBUILD) $(LDFLAGS) -o $(BUILD_SPACE)/extensions .
4040

0 commit comments

Comments
 (0)