Skip to content

Commit d75f6a0

Browse files
committed
Upgrade go to 1.18.1 on CircleCI
1 parent e462552 commit d75f6a0

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

.circleci/basis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ executors:
5050

5151
go:
5252
docker:
53-
- image: cimg/go:1.18@sha256:05b92e78b7bd5e2fc5f34e54f44d38a8b6d406bdf9107be940d06a70fe9f0cb5
53+
- image: cimg/go:1.18.1@sha256:88f7af79869ed580fc38bde8bc9fe34578c3b293426880c5d5722cc29e4d8f33
5454
environment:
5555
GO111MODULE: "on"
5656
PIP_DISABLE_PIP_VERSION_CHECK: "1"
5757
go-integration:
5858
docker:
59-
- image: cimg/go:1.18@sha256:05b92e78b7bd5e2fc5f34e54f44d38a8b6d406bdf9107be940d06a70fe9f0cb5
59+
- image: cimg/go:1.18.1@sha256:88f7af79869ed580fc38bde8bc9fe34578c3b293426880c5d5722cc29e4d8f33
6060
environment:
6161
GO111MODULE: "on"
6262
PIP_DISABLE_PIP_VERSION_CHECK: "1"
@@ -80,7 +80,7 @@ jobs:
8080
- install-go
8181
- restore_cache:
8282
keys:
83-
- go-mod-v3-{{ checksum "rolling-shutter/go.sum" }}-{{ checksum "rolling-shutter/go.mod" }}
83+
- go-mod-v4-{{ checksum "rolling-shutter/go.sum" }}-{{ checksum "rolling-shutter/go.mod" }}
8484
- restore_cache:
8585
key: pre-commit-cache-v8-{{ checksum ".pre-commit-config.yaml" }}
8686
- run:

.circleci/rolling-shutter.yml

+7-10
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
path: ~/src
88
- restore_cache:
99
keys:
10-
- rs-generate-v12-{{ checksum "go.sum" }}-{{checksum "go.mod"}}
10+
- rs-generate-v13-{{ checksum "go.sum" }}-{{checksum "go.mod"}}
1111
- install-asdf
1212
- run:
1313
name: "Install asdf plugins"
@@ -31,7 +31,7 @@ jobs:
3131
find . -name '*.gen.go' |xargs rm
3232
- run: make generate
3333
- save_cache:
34-
key: rs-generate-v12-{{ checksum "go.sum" }}-{{checksum "go.mod"}}
34+
key: rs-generate-v13-{{ checksum "go.sum" }}-{{checksum "go.mod"}}
3535
paths:
3636
- "~/go/pkg/mod"
3737
- "~/.cache/go-build"
@@ -49,10 +49,10 @@ jobs:
4949
path: ~/src
5050
- restore_cache:
5151
keys:
52-
- go-mod-v3-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
52+
- go-mod-v4-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
5353
- run: go get -d ./...
5454
- save_cache:
55-
key: go-mod-v3-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
55+
key: go-mod-v4-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
5656
paths:
5757
- ~/go/pkg/
5858
- restore_cache:
@@ -93,9 +93,6 @@ jobs:
9393
version=$(echo ${CIRCLE_TAG} | sed -e s#^rolling-shutter/##)
9494
echo >>${BASH_ENV} export VERSION="${version}"
9595
echo >>${BASH_ENV} export BIN=/tmp/release-bin
96-
- restore_cache:
97-
keys:
98-
- rs-build-go-integration-v3-{{ checksum "go.sum" }}
9996
- run: ./build-release
10097
- run: go install github.com/tcnksm/[email protected]
10198
- run:
@@ -111,10 +108,10 @@ jobs:
111108
path: ~/src
112109
- restore_cache:
113110
keys:
114-
- go-mod-v3-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
111+
- go-mod-v4-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
115112
- restore_cache:
116113
keys:
117-
- rs-lint-v5-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
114+
- rs-lint-v6-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
118115
- install-asdf
119116
- run:
120117
name: "Install golangci-lint"
@@ -124,7 +121,7 @@ jobs:
124121
- run: |
125122
make lint-changes
126123
- save_cache:
127-
key: rs-lint-v5-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
124+
key: rs-lint-v6-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
128125
paths:
129126
- "~/.cache/go-build"
130127
- "~/.cache/golangci-lint"

0 commit comments

Comments
 (0)