From 34f9e5f60ba8f8eb78fd431c99d59b34950f437c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20=C5=9Awi=C4=85tek?= Date: Tue, 12 Mar 2024 12:21:10 +0000 Subject: [PATCH] Revert "[chore] require Go 1.22 (#2747)" (#2753) This reverts commit 2409359885e241495e7c5480f85ec3b49feee7be. --- .github/workflows/continuous-integration.yaml | 6 +++--- .github/workflows/e2e.yaml | 2 +- .github/workflows/publish-images.yaml | 2 +- .github/workflows/publish-operator-opamp-bridge.yaml | 2 +- .github/workflows/publish-target-allocator.yaml | 2 +- .github/workflows/release.yaml | 2 +- .github/workflows/scorecard.yaml | 2 +- go.mod | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index 293e4f64b6..6657c7aa40 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -21,7 +21,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: "~1.22.1" + go-version: "~1.21.1" - name: Cache tools uses: actions/cache@v4 @@ -45,7 +45,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: "~1.22.1" + go-version: "~1.21.1" - name: Cache tools uses: actions/cache@v4 @@ -79,7 +79,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: "~1.22.1" + go-version: "~1.21.1" - name: Initialize CodeQL uses: github/codeql-action/init@v3 diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index e01e19b844..c7541ac061 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -45,7 +45,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: "~1.22.0" + go-version: "~1.21.3" - name: Cache tools uses: actions/cache@v4 with: diff --git a/.github/workflows/publish-images.yaml b/.github/workflows/publish-images.yaml index 060dd090f2..827bcda84b 100644 --- a/.github/workflows/publish-images.yaml +++ b/.github/workflows/publish-images.yaml @@ -19,7 +19,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: '~1.22.1' + go-version: '~1.21.3' - name: Unshallow run: git fetch --prune --unshallow diff --git a/.github/workflows/publish-operator-opamp-bridge.yaml b/.github/workflows/publish-operator-opamp-bridge.yaml index ca0d2f9cba..f51e53bff9 100644 --- a/.github/workflows/publish-operator-opamp-bridge.yaml +++ b/.github/workflows/publish-operator-opamp-bridge.yaml @@ -23,7 +23,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: '~1.22.1' + go-version: '~1.21.3' # TODO: We're currently not using this. Should we? - name: Read version diff --git a/.github/workflows/publish-target-allocator.yaml b/.github/workflows/publish-target-allocator.yaml index f5c719994f..d177ee7291 100644 --- a/.github/workflows/publish-target-allocator.yaml +++ b/.github/workflows/publish-target-allocator.yaml @@ -23,7 +23,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: '~1.22.1' + go-version: '~1.21.3' # TODO: We're currently not using this. Should we? - name: Read version diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b31de41ae7..33065f519f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -36,7 +36,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: "~1.22.1" + go-version: "~1.21.1" - name: "generate release resources" run: make release-artifacts IMG_PREFIX="ghcr.io/open-telemetry/opentelemetry-operator" VERSION=${DESIRED_VERSION} diff --git a/.github/workflows/scorecard.yaml b/.github/workflows/scorecard.yaml index 6df84d35c9..2b6be81fec 100644 --- a/.github/workflows/scorecard.yaml +++ b/.github/workflows/scorecard.yaml @@ -25,7 +25,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: "~1.22.1" + go-version: "~1.21.1" - name: Check out code into the Go module directory uses: actions/checkout@v4 diff --git a/go.mod b/go.mod index 6422ddb2fe..4602ad9072 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/open-telemetry/opentelemetry-operator -go 1.22 +go 1.21 retract v1.51.0