From 6ed19747092b266c21cdad3440b9eef4d3ab1893 Mon Sep 17 00:00:00 2001 From: BG Date: Wed, 26 Jun 2024 09:33:45 +0200 Subject: [PATCH 1/4] Bump Github Actions to use Node20 --- .github/workflows/goreleaser.yml | 4 ++-- .github/workflows/linter.yml | 4 ++-- .github/workflows/tests.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml index c054d537..b83d2f1d 100644 --- a/.github/workflows/goreleaser.yml +++ b/.github/workflows/goreleaser.yml @@ -15,12 +15,12 @@ jobs: runs-on: ubuntu-latest steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: set up go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: ">=1.20" diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index e3fb54cc..354279b9 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -7,12 +7,12 @@ jobs: runs-on: ubuntu-latest steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: set up go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: ">=1.20" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 53417e73..61b00b62 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,12 +14,12 @@ jobs: runs-on: ubuntu-latest steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: set up go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: ">=1.20" From 437190e1d9fbd367f490e78e23ca5260df0cef72 Mon Sep 17 00:00:00 2001 From: BG Date: Wed, 26 Jun 2024 09:34:46 +0200 Subject: [PATCH 2/4] Bump GoLang to fix CVE-2024-24790 --- .github/workflows/goreleaser.yml | 2 +- .github/workflows/linter.yml | 2 +- .github/workflows/tests.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml index b83d2f1d..80126707 100644 --- a/.github/workflows/goreleaser.yml +++ b/.github/workflows/goreleaser.yml @@ -22,7 +22,7 @@ jobs: - name: set up go uses: actions/setup-go@v5 with: - go-version: ">=1.20" + go-version: ">=1.22.4" - name: tests modules run: | diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 354279b9..338db87d 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -14,7 +14,7 @@ jobs: - name: set up go uses: actions/setup-go@v5 with: - go-version: ">=1.20" + go-version: ">=1.22.4" - name: golangci-lint uses: golangci/golangci-lint-action@v3 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 61b00b62..732056bb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -21,7 +21,7 @@ jobs: - name: set up go uses: actions/setup-go@v5 with: - go-version: ">=1.20" + go-version: ">=1.22.4" - name: running unit-tests run: | From 14cc2b38b183e15634508dfa967fb57dc03d8690 Mon Sep 17 00:00:00 2001 From: BG Date: Wed, 26 Jun 2024 09:35:08 +0200 Subject: [PATCH 3/4] Fix unknown --rm-dist option for goreleaser --- .github/workflows/goreleaser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml index 80126707..59de9d69 100644 --- a/.github/workflows/goreleaser.yml +++ b/.github/workflows/goreleaser.yml @@ -53,7 +53,7 @@ jobs: if: success() && startsWith(github.ref, 'refs/tags/') with: version: latest - args: release --rm-dist + args: release --clean env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} USER: github-actions From 80e2e8aead445da2e88e40ea297cfd647a189dfe Mon Sep 17 00:00:00 2001 From: Gilles Miraillet Date: Thu, 27 Jun 2024 21:31:56 +0200 Subject: [PATCH 4/4] update go.mod to use go v1.22.4 --- go.mod | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 31ff2e5f..329bbcc0 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/bosh-prometheus/bosh_exporter -go 1.21.0 - -toolchain go1.22.0 +go 1.22.4 require ( github.com/benjamintf1/unmarshalledmatchers v1.0.0