Skip to content

Commit

Permalink
Bumping Go minimum version.
Browse files Browse the repository at this point in the history
  • Loading branch information
armfazh committed Feb 10, 2023
1 parent 7a181da commit d4d399f
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .etc/golangci.yml
Expand Up @@ -5,6 +5,7 @@ linters:
# - lll
# - gocritic
# - gocognit
# - gci (deprecated since v1.30.0)
# - interfacer (deprecated since v1.38.0)
# - scopelint (deprecated since v1.39.0)
# - golint (deprecated since v1.41.0)
Expand All @@ -18,7 +19,6 @@ linters:
- exportloopref
- forbidigo
- funlen
- gci
- goconst
- gocyclo
- gofmt
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/ci-actions.yml
Expand Up @@ -10,10 +10,10 @@ on:
jobs:
amd64_job:
name: Go-${{matrix.GOVER}}/amd64
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
GOVER: ['1.19', '1.18', '1.17']
GOVER: ['1.20', '1.19', '1.18']
steps:
- name: Setup Go-${{ matrix.GOVER }}
uses: actions/setup-go@v3
Expand All @@ -24,7 +24,7 @@ jobs:
- name: Linting
uses: golangci/golangci-lint-action@v3
with:
version: v1.49
version: v1.51
args: --config=./.etc/golangci.yml ./...
- name: Check shadowing
run: |
Expand All @@ -43,11 +43,11 @@ jobs:
run: go test -v -count=1 ./...
exotic_job:
name: Go-${{matrix.CFG[2]}}/${{matrix.CFG[0]}}
needs: [ amd64_job ]
runs-on: ubuntu-20.04
needs: [amd64_job]
runs-on: ubuntu-22.04
strategy:
matrix:
CFG: [ [arm64,arm64v8,1.19] ]
CFG: [[arm64, arm64v8, '1.20']]
steps:
- uses: actions/checkout@v3
- name: Enabling Docker Experimental
Expand All @@ -63,17 +63,17 @@ jobs:
run: |
docker run --rm -v `pwd`:`pwd` -w `pwd` ${{matrix.CFG[1]}}/golang:${{matrix.CFG[2]}} go test -v ./...
coverage_amd64_job:
needs: [ amd64_job ]
needs: [amd64_job]
if: github.event_name == 'push'
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
name: amd64/coverage
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Setup Go
uses: actions/setup-go@v3
with:
go-version: '1.19'
go-version: '1.20'
- name: Produce Coverage
run: go test -coverprofile=./coverage.txt ./...
- name: Upload Codecov
Expand All @@ -82,7 +82,7 @@ jobs:
file: ./coverage.txt
osCompat:
runs-on: ${{ matrix.os }}
needs: [ amd64_job ]
needs: [amd64_job]
name: Running on ${{ matrix.os }}
strategy:
matrix:
Expand All @@ -93,7 +93,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v3
with:
go-version: '1.19'
go-version: '1.20'
- name: Building
run: go build -v ./...
- name: Testing
Expand Down
6 changes: 3 additions & 3 deletions go.mod
@@ -1,9 +1,9 @@
module github.com/cloudflare/circl

go 1.17
go 1.18

require (
github.com/bwesterb/go-ristretto v1.2.2
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab
golang.org/x/crypto v0.6.0
golang.org/x/sys v0.5.0
)
15 changes: 4 additions & 11 deletions go.sum
@@ -1,13 +1,6 @@
github.com/bwesterb/go-ristretto v1.2.2 h1:S2C0mmSjCLS3H9+zfXoIoKzl+cOncvBvt6pE+zTm5Ms=
github.com/bwesterb/go-ristretto v1.2.2/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c=
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab h1:2QkjZIsXupsJbJIdSjjUOgWK3aEtzyuh2mPt3l/CkeU=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

0 comments on commit d4d399f

Please sign in to comment.