From 45e5ddaaf8865bae2e753544d5f87ffb24adbe9f Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Tue, 9 Aug 2022 12:45:25 -0700 Subject: [PATCH] Upgrade to go1.19 all workflows except testing on go1.18 (#5877) Signed-off-by: Bogdan --- .github/workflows/api-compatibility.yml | 2 +- .github/workflows/build-and-test-windows.yaml | 2 +- .github/workflows/build-and-test.yml | 2 +- .github/workflows/builder-integration-test.yaml | 2 +- .github/workflows/builder-release.yaml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/contrib-tests.yml | 2 +- confmap/confmaptest/configtest.go | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/api-compatibility.yml b/.github/workflows/api-compatibility.yml index 7afd68138b8..1563a6e99fe 100644 --- a/.github/workflows/api-compatibility.yml +++ b/.github/workflows/api-compatibility.yml @@ -31,7 +31,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - name: Install-Tools run: | diff --git a/.github/workflows/build-and-test-windows.yaml b/.github/workflows/build-and-test-windows.yaml index d7c804276c0..d3c5883ceca 100644 --- a/.github/workflows/build-and-test-windows.yaml +++ b/.github/workflows/build-and-test-windows.yaml @@ -19,7 +19,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - name: Cache Go uses: actions/cache@v3 env: diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 27ca7752677..cac793719c2 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -44,7 +44,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - name: Cache Go id: go-cache uses: actions/cache@v3 diff --git a/.github/workflows/builder-integration-test.yaml b/.github/workflows/builder-integration-test.yaml index 78af2ccfd01..0257751577e 100644 --- a/.github/workflows/builder-integration-test.yaml +++ b/.github/workflows/builder-integration-test.yaml @@ -34,6 +34,6 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - name: Test run: cd ./cmd/builder && ./test/test.sh diff --git a/.github/workflows/builder-release.yaml b/.github/workflows/builder-release.yaml index b29297c3d79..b1c5d015eb8 100644 --- a/.github/workflows/builder-release.yaml +++ b/.github/workflows/builder-release.yaml @@ -16,7 +16,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - name: Run GoReleaser uses: goreleaser/goreleaser-action@v3 with: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 62fa3085807..53882f2c01b 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/contrib-tests.yml b/.github/workflows/contrib-tests.yml index 3a8404237e5..5ce71f18111 100644 --- a/.github/workflows/contrib-tests.yml +++ b/.github/workflows/contrib-tests.yml @@ -23,7 +23,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - name: Run Contrib Tests run: | contrib_path=/tmp/opentelemetry-collector-contrib diff --git a/confmap/confmaptest/configtest.go b/confmap/confmaptest/configtest.go index 64571e6667e..2d696d7d2b3 100644 --- a/confmap/confmaptest/configtest.go +++ b/confmap/confmaptest/configtest.go @@ -16,7 +16,7 @@ package confmaptest // import "go.opentelemetry.io/collector/confmap/confmaptest import ( "fmt" - "io/ioutil" + "os" "path/filepath" "regexp" @@ -28,7 +28,7 @@ import ( // LoadConf loads a confmap.Conf from file, and does NOT validate the configuration. func LoadConf(fileName string) (*confmap.Conf, error) { // Clean the path before using it. - content, err := ioutil.ReadFile(filepath.Clean(fileName)) + content, err := os.ReadFile(filepath.Clean(fileName)) if err != nil { return nil, fmt.Errorf("unable to read the file %v: %w", fileName, err) }