From e7cf56040c1bf33599f149594d9beea6dcc4cb8e Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Wed, 5 Jun 2024 01:40:15 -0700 Subject: [PATCH] [chore] update go to 1.21.11/1.22.4 (#33386) Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> Co-authored-by: Pablo Baeyens --- .github/workflows/build-and-test-arm.yml | 2 +- .github/workflows/build-and-test-windows.yml | 2 +- .github/workflows/build-and-test.yml | 20 +++++++++---------- .github/workflows/changelog.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/e2e-tests.yml | 8 ++++---- .github/workflows/load-tests.yml | 4 ++-- .github/workflows/prepare-release.yml | 2 +- .../workflows/prometheus-compliance-tests.yml | 2 +- .github/workflows/telemetrygen.yml | 6 +++--- .github/workflows/tidy-dependencies.yml | 2 +- cmd/otelcontribcol/go.mod | 2 +- cmd/oteltestbedcol/go.mod | 2 +- 13 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/build-and-test-arm.yml b/.github/workflows/build-and-test-arm.yml index a3412fa06aa9..443533e9897e 100644 --- a/.github/workflows/build-and-test-arm.yml +++ b/.github/workflows/build-and-test-arm.yml @@ -51,7 +51,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "~1.22.3" + go-version: "~1.22.4" cache: false - name: Cache Go id: go-cache diff --git a/.github/workflows/build-and-test-windows.yml b/.github/workflows/build-and-test-windows.yml index 39c0a556ce47..c96e7b9d9e76 100644 --- a/.github/workflows/build-and-test-windows.yml +++ b/.github/workflows/build-and-test-windows.yml @@ -58,7 +58,7 @@ jobs: run: Install-WindowsFeature -name Web-Server -IncludeManagementTools - uses: actions/setup-go@v5 with: - go-version: "1.21.10" + go-version: "1.21.11" cache: false - name: Cache Go id: go-mod-cache diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index da1da1f256a2..2226c970aaba 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21.10" + go-version: "1.21.11" cache: false - name: Cache Go id: go-cache @@ -92,7 +92,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21.10" + go-version: "1.21.11" cache: false - name: Cache Go id: go-cache @@ -161,7 +161,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5 with: - go-version: "1.21.10" + go-version: "1.21.11" cache: false - name: Cache Go id: go-cache @@ -184,7 +184,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21.10" + go-version: "1.21.11" cache: false - name: Cache Go id: go-cache @@ -253,7 +253,7 @@ jobs: strategy: fail-fast: false matrix: - go-version: ["1.22.3", "1.21.10"] # 1.20 is interpreted as 1.2 without quotes + go-version: ["1.22.4", "1.21.11"] # 1.20 is interpreted as 1.2 without quotes runner: [ubuntu-latest] group: - receiver-0 @@ -369,7 +369,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21.10" + go-version: "1.21.11" cache: false - name: Cache Go id: go-cache @@ -407,7 +407,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21.10" + go-version: "1.21.11" cache: false - name: Cache Go id: go-cache @@ -433,7 +433,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21.10" + go-version: "1.21.11" cache: false - name: Cache Go id: go-cache @@ -503,7 +503,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21.10" + go-version: "1.21.11" cache: false - name: Cache Go id: go-cache @@ -604,7 +604,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21.10" + go-version: "1.21.11" cache: false - name: Mkdir bin and dist run: | diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 2b9db858bc96..763673eca2f2 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -33,7 +33,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-go@v5 with: - go-version: "1.21.10" + go-version: "1.21.11" cache: false - name: Cache Go id: go-cache diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 961fd5e55858..33a24bd8f494 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21.10" + go-version: "1.21.11" cache: false # Initializes the CodeQL tools for scanning. diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 3f623985c13e..db663d5a7509 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -26,7 +26,7 @@ jobs: uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21.10" + go-version: "1.21.11" cache: false - name: Cache Go id: go-cache @@ -55,7 +55,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21.10" + go-version: "1.21.11" cache: false - name: Cache Go id: go-cache @@ -87,7 +87,7 @@ jobs: uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21.10" + go-version: "1.21.11" cache: false - name: Cache Go id: go-cache @@ -135,7 +135,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21.10" + go-version: "1.21.11" cache: false - name: Cache Go id: go-cache diff --git a/.github/workflows/load-tests.yml b/.github/workflows/load-tests.yml index 713037fba05d..556d11925535 100644 --- a/.github/workflows/load-tests.yml +++ b/.github/workflows/load-tests.yml @@ -28,7 +28,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21.10" + go-version: "1.21.11" cache: false - name: Cache Go id: go-cache @@ -66,7 +66,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21.10" + go-version: "1.21.11" cache: false - name: Cache Go id: go-cache diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml index 6361ae825676..fe2cebe5bffb 100644 --- a/.github/workflows/prepare-release.yml +++ b/.github/workflows/prepare-release.yml @@ -26,7 +26,7 @@ jobs: path: opentelemetry-collector-contrib - uses: actions/setup-go@v5 with: - go-version: "1.21.10" + go-version: "1.21.11" cache: false - name: Prepare release for contrib working-directory: opentelemetry-collector-contrib diff --git a/.github/workflows/prometheus-compliance-tests.yml b/.github/workflows/prometheus-compliance-tests.yml index aad3f5330c11..6fa8f15b74f7 100644 --- a/.github/workflows/prometheus-compliance-tests.yml +++ b/.github/workflows/prometheus-compliance-tests.yml @@ -31,7 +31,7 @@ jobs: path: opentelemetry-collector-contrib - uses: actions/setup-go@v5 with: - go-version: "1.21.10" + go-version: "1.21.11" cache: false - name: Cache Go id: go-cache diff --git a/.github/workflows/telemetrygen.yml b/.github/workflows/telemetrygen.yml index 8dee79047409..652e5656da03 100644 --- a/.github/workflows/telemetrygen.yml +++ b/.github/workflows/telemetrygen.yml @@ -28,7 +28,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21.10" + go-version: "1.21.11" cache: false - name: Cache Go id: go-cache @@ -67,7 +67,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21.10" + go-version: "1.21.11" cache: false - name: Cache Go id: go-cache @@ -112,7 +112,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21.10" + go-version: "1.21.11" cache: false - name: Cache Go id: go-cache diff --git a/.github/workflows/tidy-dependencies.yml b/.github/workflows/tidy-dependencies.yml index 69078cd4587b..862fbd11e773 100644 --- a/.github/workflows/tidy-dependencies.yml +++ b/.github/workflows/tidy-dependencies.yml @@ -21,7 +21,7 @@ jobs: ref: ${{ github.head_ref }} - uses: actions/setup-go@v5 with: - go-version: "1.21.10" + go-version: "1.21.11" cache: false - name: Cache Go id: go-cache diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index c945ffb0e795..3fe42aeaea25 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -4,7 +4,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/otelcontrib go 1.21.0 -toolchain go1.21.10 +toolchain go1.21.11 require ( github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.102.0 diff --git a/cmd/oteltestbedcol/go.mod b/cmd/oteltestbedcol/go.mod index e1ba02161415..aefb69d952c1 100644 --- a/cmd/oteltestbedcol/go.mod +++ b/cmd/oteltestbedcol/go.mod @@ -4,7 +4,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/oteltestbed go 1.21.0 -toolchain go1.21.10 +toolchain go1.21.11 require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.102.0