From bbdaea864b465c5b376d3d2e0133e2660e92be1c Mon Sep 17 00:00:00 2001 From: Maxime David Date: Sat, 31 May 2025 09:38:43 +0100 Subject: [PATCH 1/3] feat: use go version from collector go.mod --- .github/workflows/ci-collector.yml | 4 ++-- .github/workflows/publish-layer-collector.yml | 2 +- .github/workflows/release-layer-collector.yml | 2 +- collector/Makefile | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-collector.yml b/.github/workflows/ci-collector.yml index ecba9ee87d..1a356d0308 100644 --- a/.github/workflows/ci-collector.yml +++ b/.github/workflows/ci-collector.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: - go-version: '~1.21.9' + go-version-file: collector/go.mod - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3 with: path: ~/go/pkg/mod @@ -47,7 +47,7 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: - go-version: '~1.21.9' + go-version-file: collector/go.mod - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3 with: path: ~/go/pkg/mod diff --git a/.github/workflows/publish-layer-collector.yml b/.github/workflows/publish-layer-collector.yml index c66817e5c9..dbcb953295 100644 --- a/.github/workflows/publish-layer-collector.yml +++ b/.github/workflows/publish-layer-collector.yml @@ -78,7 +78,7 @@ jobs: - name: Setup Go uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: - go-version: '~1.21.9' + go-version-file: collector/go.mod - name: Build Collector run: | if [[ -n "${{ inputs.build-tags }}" ]]; then diff --git a/.github/workflows/release-layer-collector.yml b/.github/workflows/release-layer-collector.yml index e3dab35e1b..2f0f691185 100644 --- a/.github/workflows/release-layer-collector.yml +++ b/.github/workflows/release-layer-collector.yml @@ -37,7 +37,7 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: - go-version: '^1.24.2' + go-version-file: collector/go.mod - name: build run: make -C collector package GOARCH=${{ matrix.architecture }} - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 diff --git a/collector/Makefile b/collector/Makefile index 2bab5b2606..9ab1182ec0 100644 --- a/collector/Makefile +++ b/collector/Makefile @@ -40,6 +40,7 @@ build: clean set-otelcol-version .PHONY: package package: build + @echo Builing: go version = $(shell go version) @echo Package zip file for collector extension layer mkdir -p $(BUILD_SPACE)/collector-config cp config* $(BUILD_SPACE)/collector-config From f929149d3ad47591c4f3e8e5717dd654328f3817 Mon Sep 17 00:00:00 2001 From: Maxime David Date: Sat, 31 May 2025 09:44:45 +0100 Subject: [PATCH 2/3] fix: print go version --- collector/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/collector/Makefile b/collector/Makefile index 9ab1182ec0..e6c4a2f14c 100644 --- a/collector/Makefile +++ b/collector/Makefile @@ -34,13 +34,12 @@ clean: .PHONY: build build: clean set-otelcol-version - @echo Building otel collector extension + @echo Building otel collector extension, go version = $(shell go version) mkdir -p $(BUILD_SPACE)/extensions GOOS=linux GOARCH=$(GOARCH) $(GOBUILD) $(LDFLAGS) -o $(BUILD_SPACE)/extensions . .PHONY: package package: build - @echo Builing: go version = $(shell go version) @echo Package zip file for collector extension layer mkdir -p $(BUILD_SPACE)/collector-config cp config* $(BUILD_SPACE)/collector-config From 8357eb89c53e5174b7789dc7a11b0a8db7606cbb Mon Sep 17 00:00:00 2001 From: Maxime David Date: Sat, 31 May 2025 10:04:02 +0100 Subject: [PATCH 3/3] fix: go version is already in the output --- collector/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collector/Makefile b/collector/Makefile index e6c4a2f14c..1bd09f3f6d 100644 --- a/collector/Makefile +++ b/collector/Makefile @@ -34,7 +34,7 @@ clean: .PHONY: build build: clean set-otelcol-version - @echo Building otel collector extension, go version = $(shell go version) + @echo Building otel collector extension, $(shell go version) mkdir -p $(BUILD_SPACE)/extensions GOOS=linux GOARCH=$(GOARCH) $(GOBUILD) $(LDFLAGS) -o $(BUILD_SPACE)/extensions .