From d0599ade1d981d38784f8991822cad160b59f0ab Mon Sep 17 00:00:00 2001 From: Nicholas Wiersma Date: Sun, 11 Aug 2024 07:43:49 +0200 Subject: [PATCH 1/2] chore: bump deps --- .github/workflows/release.yml | 8 ++++---- .github/workflows/test.yml | 12 ++++++------ .golangci.yml | 19 ++++--------------- .goreleaser.yml | 1 + go.mod | 6 +++--- go.sum | 8 ++++---- 6 files changed, 22 insertions(+), 32 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dc6517e..6416584 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,12 +9,12 @@ jobs: runs-on: ubuntu-latest env: - GO_VERSION: "1.21" + GO_VERSION: "1.22" steps: - name: Install Go if: success() - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} @@ -22,7 +22,7 @@ jobs: uses: actions/checkout@v4 - name: Cache Go modules - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} @@ -30,7 +30,7 @@ jobs: ${{ runner.os }}-go- - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v5 + uses: goreleaser/goreleaser-action@v6 with: version: latest args: release --clean diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2da7c90..f945a16 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,13 +12,13 @@ jobs: env: GOOS: js GOARCH: wasm - GO_VERSION: "1.21" - GOLANGCI_LINT_VERSION: v1.55.0 + GO_VERSION: "1.22" + GOLANGCI_LINT_VERSION: v1.59.1 steps: - name: Install Go if: success() - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} @@ -26,7 +26,7 @@ jobs: uses: actions/checkout@v4 - name: Cache Go modules - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} @@ -34,7 +34,7 @@ jobs: ${{ runner.os }}-go- - name: Run linter - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v6 with: version: ${{ env.GOLANGCI_LINT_VERSION }} - skip-pkg-cache: true + skip-cache: true diff --git a/.golangci.yml b/.golangci.yml index af23fde..5c14b27 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -9,22 +9,10 @@ linters-settings: linters: enable-all: true disable: - - interfacebloat - - sqlclosecheck # not relevant (SQL) - - rowserrcheck # not relevant (SQL) - - execinquery # not relevant (SQL) - - interfacer # deprecated - - scopelint # deprecated - - maligned # deprecated - - golint # deprecated - - deadcode # deprecated - - exhaustivestruct # deprecated - - ifshort # deprecated - - nosnakecase # deprecated - - structcheck # deprecated - - varcheck # deprecated - cyclop # duplicate of gocyclo + - execinquery # deprecated - depguard + - err113 - exhaustive - exhaustruct - forcetypeassert @@ -33,9 +21,10 @@ linters: - gochecknoinits - gocognit - gocyclo - - goerr113 - gomnd + - interfacebloat - ireturn + - mnd - nestif - nlreturn - nonamedreturns diff --git a/.goreleaser.yml b/.goreleaser.yml index 067fd38..7dd6e44 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,3 +1,4 @@ +version: 2 project_name: calendar dist: dist diff --git a/go.mod b/go.mod index 44c3d77..3d9bd64 100644 --- a/go.mod +++ b/go.mod @@ -1,15 +1,15 @@ module github.com/glasslabs/calendar -go 1.21.3 +go 1.22 require ( github.com/apognu/gocal v0.9.0 - github.com/glasslabs/client-go v0.1.0 + github.com/glasslabs/client-go v0.2.0 ) require ( github.com/ChannelMeter/iso8601duration v0.0.0-20150204201828-8da3af7a2a61 // indirect github.com/stretchr/testify v1.8.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - honnef.co/go/js/dom/v2 v2.0.0-20230808055721-96db8f4d5e3b // indirect + honnef.co/go/js/dom/v2 v2.0.0-20231112215516-51f43a291193 // indirect ) diff --git a/go.sum b/go.sum index 1b25f4e..c2eb79b 100644 --- a/go.sum +++ b/go.sum @@ -7,8 +7,8 @@ github.com/channelmeter/iso8601duration v0.0.0-20150204201828-8da3af7a2a61/go.mo github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/glasslabs/client-go v0.1.0 h1:a2Ob6EMyglz+Jy53diQv62ZCBVA4/BONF3e2APcnlr0= -github.com/glasslabs/client-go v0.1.0/go.mod h1:CpO4gMLfNrbhZQsNlNjq1KcGUAk35eCWj35YBb2xccw= +github.com/glasslabs/client-go v0.2.0 h1:n1w7pC3I3t7Lru1yJbmuhIjuPCprefhAF1V2jjvq/Bs= +github.com/glasslabs/client-go v0.2.0/go.mod h1:IyhCNLlDg7KolU1WRHGXbfTbT0zLvxtrefoQlby+p9U= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -24,5 +24,5 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/js/dom/v2 v2.0.0-20230808055721-96db8f4d5e3b h1:XOEHdukvK2DAtBpN8kQbuj6UIK5dz9DLvqc51o6w4L0= -honnef.co/go/js/dom/v2 v2.0.0-20230808055721-96db8f4d5e3b/go.mod h1:+JtEcbinwR4znM12aluJ3WjKgvhDPKPQ8hnP4YM+4jI= +honnef.co/go/js/dom/v2 v2.0.0-20231112215516-51f43a291193 h1:qc3CbLs/1Tb3N7yIKKph/UbUoyI8YQfTF1apIvqX/I8= +honnef.co/go/js/dom/v2 v2.0.0-20231112215516-51f43a291193/go.mod h1:+JtEcbinwR4znM12aluJ3WjKgvhDPKPQ8hnP4YM+4jI= From 51290a37b3b983e62f5e98372a26141f320e716d Mon Sep 17 00:00:00 2001 From: Nicholas Wiersma Date: Sun, 11 Aug 2024 07:46:02 +0200 Subject: [PATCH 2/2] fix: build on test --- .github/workflows/test.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f945a16..cfb82f5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -38,3 +38,9 @@ jobs: with: version: ${{ env.GOLANGCI_LINT_VERSION }} skip-cache: true + + - name: Run GoReleaser + uses: goreleaser/goreleaser-action@v6 + with: + version: latest + args: release --clean --snapshot