Skip to content

Commit d4d399f

Browse files
committed
Bumping Go minimum version.
1 parent 7a181da commit d4d399f

File tree

4 files changed

+19
-26
lines changed

4 files changed

+19
-26
lines changed

.etc/golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ linters:
55
# - lll
66
# - gocritic
77
# - gocognit
8+
# - gci (deprecated since v1.30.0)
89
# - interfacer (deprecated since v1.38.0)
910
# - scopelint (deprecated since v1.39.0)
1011
# - golint (deprecated since v1.41.0)
@@ -18,7 +19,6 @@ linters:
1819
- exportloopref
1920
- forbidigo
2021
- funlen
21-
- gci
2222
- goconst
2323
- gocyclo
2424
- gofmt

.github/workflows/ci-actions.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ on:
1010
jobs:
1111
amd64_job:
1212
name: Go-${{matrix.GOVER}}/amd64
13-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-22.04
1414
strategy:
1515
matrix:
16-
GOVER: ['1.19', '1.18', '1.17']
16+
GOVER: ['1.20', '1.19', '1.18']
1717
steps:
1818
- name: Setup Go-${{ matrix.GOVER }}
1919
uses: actions/setup-go@v3
@@ -24,7 +24,7 @@ jobs:
2424
- name: Linting
2525
uses: golangci/golangci-lint-action@v3
2626
with:
27-
version: v1.49
27+
version: v1.51
2828
args: --config=./.etc/golangci.yml ./...
2929
- name: Check shadowing
3030
run: |
@@ -43,11 +43,11 @@ jobs:
4343
run: go test -v -count=1 ./...
4444
exotic_job:
4545
name: Go-${{matrix.CFG[2]}}/${{matrix.CFG[0]}}
46-
needs: [ amd64_job ]
47-
runs-on: ubuntu-20.04
46+
needs: [amd64_job]
47+
runs-on: ubuntu-22.04
4848
strategy:
4949
matrix:
50-
CFG: [ [arm64,arm64v8,1.19] ]
50+
CFG: [[arm64, arm64v8, '1.20']]
5151
steps:
5252
- uses: actions/checkout@v3
5353
- name: Enabling Docker Experimental
@@ -63,17 +63,17 @@ jobs:
6363
run: |
6464
docker run --rm -v `pwd`:`pwd` -w `pwd` ${{matrix.CFG[1]}}/golang:${{matrix.CFG[2]}} go test -v ./...
6565
coverage_amd64_job:
66-
needs: [ amd64_job ]
66+
needs: [amd64_job]
6767
if: github.event_name == 'push'
68-
runs-on: ubuntu-20.04
68+
runs-on: ubuntu-22.04
6969
name: amd64/coverage
7070
steps:
7171
- name: Checkout
7272
uses: actions/checkout@v3
7373
- name: Setup Go
7474
uses: actions/setup-go@v3
7575
with:
76-
go-version: '1.19'
76+
go-version: '1.20'
7777
- name: Produce Coverage
7878
run: go test -coverprofile=./coverage.txt ./...
7979
- name: Upload Codecov
@@ -82,7 +82,7 @@ jobs:
8282
file: ./coverage.txt
8383
osCompat:
8484
runs-on: ${{ matrix.os }}
85-
needs: [ amd64_job ]
85+
needs: [amd64_job]
8686
name: Running on ${{ matrix.os }}
8787
strategy:
8888
matrix:
@@ -93,7 +93,7 @@ jobs:
9393
- name: Setup Go
9494
uses: actions/setup-go@v3
9595
with:
96-
go-version: '1.19'
96+
go-version: '1.20'
9797
- name: Building
9898
run: go build -v ./...
9999
- name: Testing

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
module github.com/cloudflare/circl
22

3-
go 1.17
3+
go 1.18
44

55
require (
66
github.com/bwesterb/go-ristretto v1.2.2
7-
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
8-
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab
7+
golang.org/x/crypto v0.6.0
8+
golang.org/x/sys v0.5.0
99
)

go.sum

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

0 commit comments

Comments
 (0)