Skip to content

Commit 7df28e1

Browse files
committed
Use go 1.21.0
1 parent 359ff80 commit 7df28e1

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

.circleci/basis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ executors:
4242

4343
go:
4444
docker:
45-
- image: cimg/go:1.20.3
45+
- image: cimg/go:1.21.0
4646
environment:
4747
GO111MODULE: "on"
4848
PIP_DISABLE_PIP_VERSION_CHECK: "1"
4949
go-integration:
5050
docker:
51-
- image: cimg/go:1.20.3
51+
- image: cimg/go:1.21.0
5252
environment:
5353
GO111MODULE: "on"
5454
PIP_DISABLE_PIP_VERSION_CHECK: "1"
@@ -80,7 +80,7 @@ jobs:
8080
asdf install pre-commit
8181
- restore_cache:
8282
keys:
83-
- go-mod-v6-{{ checksum "rolling-shutter/go.sum" }}-{{ checksum "rolling-shutter/go.mod" }}
83+
- go-mod-v7-{{ checksum "rolling-shutter/go.sum" }}-{{ checksum "rolling-shutter/go.mod" }}
8484
- restore_cache:
8585
key: pre-commit-cache-v11-{{ checksum ".pre-commit-config.yaml" }}
8686
- run: pre-commit install-hooks

.circleci/rolling-shutter.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ jobs:
5151
path: ~/src
5252
- restore_cache:
5353
keys:
54-
- go-mod-v6-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
54+
- go-mod-v7-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
5555
- run: go get -d ./...
5656
- save_cache:
57-
key: go-mod-v6-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
57+
key: go-mod-v7-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
5858
paths:
5959
- ~/go/pkg/
6060
- restore_cache:
6161
keys:
62-
- rs-build-<< parameters.go-version >>-v3-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
62+
- rs-build-<< parameters.go-version >>-v4-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
6363
- install-asdf
6464
- run:
6565
name: "Install asdf plugins"
@@ -90,7 +90,7 @@ jobs:
9090
- store_test_results:
9191
path: report
9292
- save_cache:
93-
key: rs-build-<< parameters.go-version >>-v3-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
93+
key: rs-build-<< parameters.go-version >>-v4-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
9494
paths:
9595
- "~/.cache/go-build"
9696

@@ -186,7 +186,7 @@ jobs:
186186
path: ~/src
187187
- restore_cache:
188188
keys:
189-
- go-mod-v6-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
189+
- go-mod-v7-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
190190
- restore_cache:
191191
keys:
192192
- rs-lint-v13-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}

.tool-versions

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
babashka 1.3.182
2-
binaryen 112
2+
binaryen 114
33
circleci 0.1.28811
44
clojure 1.11.1.1386
5-
golang 1.20.3
5+
golang 1.21.0
66
golangci-lint 1.54.1
77
java temurin-17.0.5+8
88
nodejs 18.17.0
@@ -12,4 +12,4 @@ protoc 22.3
1212
shfmt 3.7.0
1313
solidity 0.8.9
1414
sqlc 1.19.1
15-
tinygo 0.27.0
15+
tinygo 0.29.0

docker/build-src/snapshot/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.20 as builder
1+
FROM golang:1.21 as builder
22
ENV GOMODCACHE=/root/.cache/mod
33
# Fetch go modules separately to improve cache usage
44
RUN mkdir /gomod

play/src/sht/collator_test.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
:loop/checks [{:check :collator/decryption-trigger}]}
129129
{:check :loop/until
130130
:loop/description "batchtx generation should work"
131-
:loop/timeout-ms (* 20 1000)
131+
:loop/timeout-ms (* 22 1000)
132132
:loop/checks [{:check :collator/have-batch-tx
133133
:collator/num-batchtxs 5}]}
134134
;; {:check :loop/forever}

0 commit comments

Comments
 (0)