From 5aa4c1f6112e6f33dc8f7d23311328d1db8e10fe Mon Sep 17 00:00:00 2001 From: hoenn Date: Thu, 8 Feb 2024 13:45:45 -0500 Subject: [PATCH] Update go version in mod and workflows --- .github/workflows/golangci-lint.yml | 11 ++++++----- .github/workflows/releases.yml | 4 ++-- .github/workflows/workflow.yml | 5 ++--- .golangci.yaml | 7 ++++--- go.mod | 14 ++++++++++++-- go.sum | 10 ++++------ script/test | 2 -- 7 files changed, 30 insertions(+), 23 deletions(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 07ef9e4..4da5931 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -16,16 +16,17 @@ jobs: name: lint runs-on: ubuntu-latest steps: - - name: Set up Go 1.15 - uses: actions/setup-go@v4 + - name: Checkout project + uses: actions/checkout@v4 + - name: Setup Go + uses: actions/setup-go@v5 with: - go-version: '1.15' - - uses: actions/checkout@v2 + go-version: '1.22' - name: golangci-lint uses: golangci/golangci-lint-action@v3.7.0 with: # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version - version: v1.46.2 + version: v1.55.2 # Optional: working directory, useful for monorepos # working-directory: somedir diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml index 802bcb3..8004e1a 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/releases.yml @@ -16,9 +16,9 @@ jobs: fetch-depth: 0 - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v5 with: - go-version: 1.17 + go-version: 1.22 - name: Run GoReleaser uses: goreleaser/goreleaser-action@v2 diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 379aca1..4a5532a 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -6,16 +6,15 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: [ '1.15.x', '1.16.x', '1.17.x' ] + go: [ '1.22.x' ] name: Vulcanizer tests against go version ${{ matrix.go }} steps: - uses: actions/checkout@v2 - name: Setup go - uses: actions/setup-go@v2 + uses: actions/setup-go@v5 with: go-version: ${{ matrix.go }} - name: Run tests run: | - curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $GOROOT/bin v1.46.2 sudo sysctl -w vm.max_map_count=262144 script/integration-test diff --git a/.golangci.yaml b/.golangci.yaml index 7548cb3..c2fcfea 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -13,8 +13,8 @@ linters-settings: linters: enable: - - depguard - errcheck + - errorlint - exportloopref - gocritic - gocyclo @@ -27,14 +27,15 @@ linters: - misspell - nakedret - prealloc - - revive - staticcheck - typecheck - unconvert - unused + - revive + - reassign + - unparam disable: - gochecknoglobals # we allow global variables in packages - gochecknoinits # we allow inits in packages - goconst # we allow repeated values to go un-const'd - lll # we allow any line length - - unparam # we allow function calls to name unused parameters diff --git a/go.mod b/go.mod index c74ebcf..342534a 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/github/vulcanizer -go 1.15 +go 1.22 require ( github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484 // indirect @@ -21,9 +21,19 @@ require ( github.com/spf13/viper v1.7.1 github.com/tidwall/gjson v1.11.0 golang.org/x/net v0.0.0-20200927032502-5d4f70055728 // indirect - golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 // indirect + golang.org/x/sys v0.13.0 // indirect gopkg.in/ini.v1 v1.61.0 // indirect gopkg.in/yaml.v2 v2.3.0 // indirect gotest.tools v2.2.0+incompatible moul.io/http2curl v1.0.0 // indirect ) + +require ( + github.com/google/go-cmp v0.3.0 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/subosito/gotenv v1.2.0 // indirect + github.com/tidwall/match v1.1.1 // indirect + github.com/tidwall/pretty v1.2.0 // indirect + golang.org/x/text v0.13.0 // indirect +) diff --git a/go.sum b/go.sum index d798ee3..d866b30 100644 --- a/go.sum +++ b/go.sum @@ -41,7 +41,6 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484 h1:pEtiCjIXx3RvGjlUJuCNxNOw0MNblyR9Wi+vJGBFh+8= github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= -github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2 h1:dWB6v3RcOy03t/bUadywsbyrQwCqZeNIEX6M1OtSZOM= github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= @@ -292,15 +291,14 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200929083018-4d22bbb62b3c h1:/h0vtH0PyU0xAoZJVcRw1k0Ng+U0JAy3QDiFmppIlIE= -golang.org/x/sys v0.0.0-20200929083018-4d22bbb62b3c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 h1:v1W7bwXHsnLLloWYTVEdvGvA7BHMeBYsPcF0GLDxIRs= -golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/script/test b/script/test index 8fb4f03..1595fe4 100755 --- a/script/test +++ b/script/test @@ -10,5 +10,3 @@ then else go test -v github.com/github/vulcanizer/... fi - -golangci-lint -v run