Skip to content

Commit 884922b

Browse files
authored
Merge pull request #23 from tri-adam/go1.13
Update to Go v1.13
2 parents e3fbcc2 + 9862b63 commit 884922b

File tree

4 files changed

+13
-43
lines changed

4 files changed

+13
-43
lines changed

.circleci/config.yml

+5-36
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ orbs:
66
defaults: &defaults
77
working_directory: /src
88
docker:
9-
- image: golang:1.12
9+
- image: golang:1.13
1010

1111
jobs:
1212
lint_markdown:
@@ -22,28 +22,10 @@ jobs:
2222
name: Check for Lint
2323
command: markdownlint .
2424

25-
cache_go_mod:
26-
<<: *defaults
27-
steps:
28-
- checkout
29-
- restore_cache:
30-
keys:
31-
- go-mod-{{ checksum "go.sum" }}
32-
- run:
33-
name: Populate Go Mod Cache
34-
command: go mod download
35-
- save_cache:
36-
key: go-mod-{{ checksum "go.sum" }}
37-
paths:
38-
- '/go/pkg/mod'
39-
4025
build_source:
4126
<<: *defaults
4227
steps:
4328
- checkout
44-
- restore_cache:
45-
keys:
46-
- go-mod-{{ checksum "go.sum" }}
4729
- run:
4830
name: Build Source
4931
command: go build -mod=readonly ./...
@@ -52,12 +34,9 @@ jobs:
5234
<<: *defaults
5335
steps:
5436
- checkout
55-
- restore_cache:
56-
keys:
57-
- go-mod-{{ checksum "go.sum" }}
5837
- run:
5938
name: Install golangci-lint
60-
command: curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.17.1
39+
command: curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.18.0
6140
- run:
6241
name: Check for Lint
6342
command: golangci-lint run
@@ -66,9 +45,6 @@ jobs:
6645
<<: *defaults
6746
steps:
6847
- checkout
69-
- restore_cache:
70-
keys:
71-
- go-mod-{{ checksum "go.sum" }}
7248
- run:
7349
name: Run Tests
7450
command: go test -coverprofile cover.out -race ./...
@@ -81,13 +57,6 @@ workflows:
8157
build_and_test:
8258
jobs:
8359
- lint_markdown
84-
- cache_go_mod
85-
- build_source:
86-
requires:
87-
- cache_go_mod
88-
- lint_source:
89-
requires:
90-
- cache_go_mod
91-
- unit_test:
92-
requires:
93-
- cache_go_mod
60+
- build_source
61+
- lint_source
62+
- unit_test

.golangci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
linters:
22
enable-all: true
33
disable:
4+
- funlen
45
- gochecknoglobals
56
- gocritic
67
- gosec

go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
module github.com/sylabs/scs-build-client
22

3-
go 1.12
3+
go 1.13
44

55
require (
66
github.com/go-log/log v0.1.0
7-
github.com/gorilla/websocket v1.4.0
8-
github.com/sylabs/json-resp v0.5.0
7+
github.com/gorilla/websocket v1.4.1
8+
github.com/sylabs/json-resp v0.6.0
99
)

go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
github.com/go-log/log v0.1.0 h1:wudGTNsiGzrD5ZjgIkVZ517ugi2XRe9Q/xRCzwEO4/U=
22
github.com/go-log/log v0.1.0/go.mod h1:4mBwpdRMFLiuXZDCwU2lKQFsoSCo72j3HqBK9d81N2M=
3-
github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
4-
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
5-
github.com/sylabs/json-resp v0.5.0 h1:AWdKu6aS0WrkkltX1M0ex0lENrIcx5TISox902s2L2M=
6-
github.com/sylabs/json-resp v0.5.0/go.mod h1:anCzED2SGHHZQDubMuoVtwMuJZdpqQ+7iso8yDFm/nQ=
3+
github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
4+
github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
5+
github.com/sylabs/json-resp v0.6.0 h1:W/yxwBu6WPMqiU9YBaelUsfWU1ZD+x4f4rxqmTr0LaI=
6+
github.com/sylabs/json-resp v0.6.0/go.mod h1:QYGGBTYDgiIH+c6zRQuVd4PIYfm//vFD2flnIdF1k7E=

0 commit comments

Comments
 (0)