Skip to content

Commit 6800fc8

Browse files
authored
chore: bump go (->v1.21.5) and sqlc (->v1.24.0) to new versions (#11170)
1 parent 6b4d908 commit 6800fc8

File tree

8 files changed

+10
-8
lines changed

8 files changed

+10
-8
lines changed

.github/actions/setup-go/action.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: |
44
inputs:
55
version:
66
description: "The Go version to use."
7-
default: "1.20.11"
7+
default: "1.21.5"
88
runs:
99
using: "composite"
1010
steps:

.github/actions/setup-sqlc/action.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ runs:
77
- name: Setup sqlc
88
uses: sqlc-dev/setup-sqlc@v4
99
with:
10-
sqlc-version: "1.20.0"
10+
sqlc-version: "1.24.0"

.github/workflows/ci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ jobs:
228228
with:
229229
# This doesn't need caching. It's super fast anyways!
230230
cache: false
231-
go-version: 1.20.11
231+
go-version: 1.21.5
232232

233233
- name: Install shfmt
234234
run: go install mvdan.cc/sh/v3/cmd/shfmt@v3.7.0

coderd/database/models.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coderd/database/querier.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coderd/database/queries.sql.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coderd/database/sqlc.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ sql:
8686
# schema loaded and migrations run. Run `make sqlc-vet` to run the linter.
8787
database:
8888
uri: "${SQLC_DATABASE_URL}"
89+
analyzer:
90+
database: false
8991
rules:
9092
- sqlc/db-prepare
9193
gen:

dogfood/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM ubuntu:jammy AS go
88

99
RUN apt-get update && apt-get install --yes curl gcc
1010
# Install Go manually, so that we can control the version
11-
ARG GO_VERSION=1.20.11
11+
ARG GO_VERSION=1.21.5
1212
RUN mkdir --parents /usr/local/go
1313

1414
# Boring Go is needed to build FIPS-compliant binaries.
@@ -53,7 +53,7 @@ RUN mkdir --parents "$GOPATH" && \
5353
# charts and values files
5454
go install github.com/norwoodj/helm-docs/cmd/helm-docs@v1.5.0 && \
5555
# sqlc for Go code generation
56-
go install github.com/sqlc-dev/sqlc/cmd/sqlc@v1.20.0 && \
56+
(CGO_ENABLED=1 go install github.com/sqlc-dev/sqlc/cmd/sqlc@v1.24.0) && \
5757
# gcr-cleaner-cli used by CI to prune unused images
5858
go install github.com/sethvargo/gcr-cleaner/cmd/gcr-cleaner-cli@v0.5.1 && \
5959
# ruleguard for checking custom rules, without needing to run all of

0 commit comments

Comments
 (0)