From a8c7c7fdbc82840a470d9e746fa27ff7582f0733 Mon Sep 17 00:00:00 2001 From: Bruno Schaatsbergen Date: Thu, 30 Nov 2023 23:35:52 +0100 Subject: [PATCH 1/5] chore: bump to go1.21.4 --- .github/workflows/go.yaml | 2 +- .github/workflows/goreleaser.yaml | 2 +- go.mod | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/go.yaml b/.github/workflows/go.yaml index 768efcc..8497d66 100644 --- a/.github/workflows/go.yaml +++ b/.github/workflows/go.yaml @@ -11,7 +11,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.19 + go-version: 1.21.4 - name: Generate run: go generate -v ./... diff --git a/.github/workflows/goreleaser.yaml b/.github/workflows/goreleaser.yaml index 01f4f6c..3cff3c9 100644 --- a/.github/workflows/goreleaser.yaml +++ b/.github/workflows/goreleaser.yaml @@ -16,7 +16,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: 1.19.x + go-version: 1.21.4 - name: Run GoReleaser uses: goreleaser/goreleaser-action@v2 with: diff --git a/go.mod b/go.mod index 43e3761..a5f3973 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/bschaatsbergen/cidr -go 1.19 +go 1.21.4 require github.com/spf13/cobra v1.5.0 From f9b5ed8d2a60826a58926e3824d320f02ea1c2d7 Mon Sep 17 00:00:00 2001 From: Bruno Schaatsbergen Date: Thu, 30 Nov 2023 23:36:48 +0100 Subject: [PATCH 2/5] chore: update go checksum --- go.sum | 1 + 1 file changed, 1 insertion(+) diff --git a/go.sum b/go.sum index 4031008..446c0b9 100644 --- a/go.sum +++ b/go.sum @@ -16,6 +16,7 @@ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSS github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From d9c1cbd847ff4668e21be40f9dd1dfdac4a42ac5 Mon Sep 17 00:00:00 2001 From: Bruno Schaatsbergen Date: Fri, 1 Dec 2023 00:24:41 +0100 Subject: [PATCH 3/5] chore: set `configuration-path` --- .github/workflows/triage-ci.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/triage-ci.yaml b/.github/workflows/triage-ci.yaml index b795124..2b70d3a 100644 --- a/.github/workflows/triage-ci.yaml +++ b/.github/workflows/triage-ci.yaml @@ -10,3 +10,5 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/labeler@v4 + with: + configuration-path: .github/labeler.yaml From 5ff1fdd720dac0c6c939f8ef4ede125266bd5d5f Mon Sep 17 00:00:00 2001 From: Bruno Schaatsbergen Date: Fri, 1 Dec 2023 00:26:48 +0100 Subject: [PATCH 4/5] Update labeler.yaml --- .github/labeler.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/labeler.yaml b/.github/labeler.yaml index 9c4165a..252ccee 100644 --- a/.github/labeler.yaml +++ b/.github/labeler.yaml @@ -1,5 +1,5 @@ github-actions: -- '.github/*' +- '.github/**' - '.goreleaser.yaml' dependencies: From a47beadf006c4756ec36fa4f652612b3402edcc6 Mon Sep 17 00:00:00 2001 From: Bruno Schaatsbergen Date: Fri, 1 Dec 2023 10:34:24 +0100 Subject: [PATCH 5/5] chore: use setup-go and pin to `go.mod` --- .github/workflows/ci.yaml | 10 +++------- .github/workflows/codeql-analysis.yaml | 5 +++++ .github/workflows/goreleaser.yaml | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1013b3c..92c4905 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,17 +7,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - - name: Set up Go - uses: actions/setup-go@v2 + - name: Setup Go + uses: actions/setup-go@v4 with: - go-version: 1.21.4 - + go-version-file: go.mod - name: Generate run: go generate -v ./... - - name: Build run: go build -v ./... - - name: Test run: go test -v ./... diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index 77f5edc..a419bee 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -34,6 +34,11 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 + - name: Setup Go + uses: actions/setup-go@v4 + with: + go-version-file: go.mod + # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v2 diff --git a/.github/workflows/goreleaser.yaml b/.github/workflows/goreleaser.yaml index 3cff3c9..8f2879f 100644 --- a/.github/workflows/goreleaser.yaml +++ b/.github/workflows/goreleaser.yaml @@ -14,9 +14,9 @@ jobs: with: fetch-depth: 0 - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v4 with: - go-version: 1.21.4 + go-version-file: go.mod - name: Run GoReleaser uses: goreleaser/goreleaser-action@v2 with: