Skip to content

Commit

Permalink
chore: bump minimum Go version to 1.22 (#603)
Browse files Browse the repository at this point in the history
  • Loading branch information
carstendietrich authored Aug 22, 2024
1 parent 4161ce5 commit 12d5422
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ jobs:
- name: golangci-lint
uses: golangci/golangci-lint-action@v6
with:
version: 'v1.59'
version: 'v1.60'
args: $(rev=${{ env.REV }}; if [[ $rev != '' ]]; then echo --new-from-rev=$rev; fi)

2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go: [ '1.21', '1.x' ]
go: [ '1.22', '1.x' ]
name: With Go ${{ matrix.go }}
steps:
- uses: actions/checkout@v4
Expand Down
14 changes: 5 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module flamingo.me/flamingo-commerce/v3

go 1.21
go 1.22

toolchain go1.22.6
toolchain go1.23.0

require (
flamingo.me/dingo v0.2.10
Expand Down Expand Up @@ -53,6 +53,7 @@ require (
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cockroachdb/apd v1.1.0 // indirect
github.com/cockroachdb/apd/v2 v2.0.1 // indirect
github.com/containerd/containerd v1.7.18 // indirect
github.com/containerd/errdefs v0.1.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/coreos/go-oidc/v3 v3.11.0 // indirect
Expand Down Expand Up @@ -136,6 +137,7 @@ require (
github.com/sergi/go-diff v1.3.1 // indirect
github.com/shirou/gopsutil/v3 v3.23.12 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/shopspring/decimal v1.2.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/sosodev/duration v1.3.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
Expand All @@ -160,6 +162,7 @@ require (
go.uber.org/automaxprocs v1.5.3 // indirect
go.uber.org/multierr v1.10.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/crypto v0.25.0 // indirect
golang.org/x/net v0.27.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sync v0.8.0 // indirect
Expand All @@ -175,13 +178,6 @@ require (
moul.io/http2curl/v2 v2.3.0 // indirect
)

require (
github.com/containerd/containerd v1.7.18 // indirect
github.com/shopspring/decimal v1.2.0 // indirect
golang.org/x/crypto v0.25.0 // indirect
gotest.tools/v3 v3.5.1
)

exclude (
github.com/coreos/etcd v3.3.27+incompatible
github.com/gomodule/redigo v2.0.0+incompatible
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ package graphqlproductdto
import (
"testing"

"gotest.tools/v3/assert"

"flamingo.me/flamingo-commerce/v3/product/domain"
"github.com/stretchr/testify/assert"
)

func TestVariantSelectionMappingOfConfigurableProducts(t *testing.T) {
Expand Down Expand Up @@ -191,21 +190,21 @@ func TestVariantSelectionMappingOfConfigurableProducts(t *testing.T) {
},
}

assert.DeepEqual(t, want.Attributes, got.Attributes)
assert.Equal(t, want.Attributes, got.Attributes)

assert.DeepEqual(t, got.Variants[0].Attributes, redSMarchingSelection)
assert.Equal(t, got.Variants[0].Attributes, redSMarchingSelection)
assert.Equal(t, got.Variants[0].Variant.MarketplaceCode, redS.MarketPlaceCode)

assert.DeepEqual(t, got.Variants[1].Attributes, redMMarchingSelection)
assert.Equal(t, got.Variants[1].Attributes, redMMarchingSelection)
assert.Equal(t, got.Variants[1].Variant.MarketplaceCode, redM.MarketPlaceCode)

assert.DeepEqual(t, got.Variants[2].Attributes, redLMatchingSelection)
assert.Equal(t, got.Variants[2].Attributes, redLMatchingSelection)
assert.Equal(t, got.Variants[2].Variant.MarketplaceCode, redL.MarketPlaceCode)

assert.DeepEqual(t, got.Variants[3].Attributes, blueSMatchingSelection)
assert.Equal(t, got.Variants[3].Attributes, blueSMatchingSelection)
assert.Equal(t, got.Variants[3].Variant.MarketplaceCode, blueS.MarketPlaceCode)

assert.DeepEqual(t, got.Variants[4].Attributes, blueMMatchingSelection)
assert.Equal(t, got.Variants[4].Attributes, blueMMatchingSelection)
assert.Equal(t, got.Variants[4].Variant.MarketplaceCode, blueM.MarketPlaceCode)
})
}

0 comments on commit 12d5422

Please sign in to comment.