diff --git a/.github/actions/setup-go/action.yaml b/.github/actions/setup-go/action.yaml index 589d78eacb..d4c67cb7dd 100644 --- a/.github/actions/setup-go/action.yaml +++ b/.github/actions/setup-go/action.yaml @@ -4,7 +4,7 @@ description: | inputs: version: description: "The Go version to use." - default: "1.20.11" + default: "1.21.5" runs: using: "composite" steps: diff --git a/.github/actions/setup-sqlc/action.yaml b/.github/actions/setup-sqlc/action.yaml index 054bc78e20..151970389f 100644 --- a/.github/actions/setup-sqlc/action.yaml +++ b/.github/actions/setup-sqlc/action.yaml @@ -7,4 +7,4 @@ runs: - name: Setup sqlc uses: sqlc-dev/setup-sqlc@v4 with: - sqlc-version: "1.20.0" + sqlc-version: "1.24.0" diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ff2b54e45d..eb41e96ce2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -228,7 +228,7 @@ jobs: with: # This doesn't need caching. It's super fast anyways! cache: false - go-version: 1.20.11 + go-version: 1.21.5 - name: Install shfmt run: go install mvdan.cc/sh/v3/cmd/shfmt@v3.7.0 diff --git a/coderd/database/models.go b/coderd/database/models.go index 17eb47be98..47b095a755 100644 --- a/coderd/database/models.go +++ b/coderd/database/models.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.20.0 +// sqlc v1.24.0 package database diff --git a/coderd/database/querier.go b/coderd/database/querier.go index 7c3b649d0c..08d76ba3d9 100644 --- a/coderd/database/querier.go +++ b/coderd/database/querier.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.20.0 +// sqlc v1.24.0 package database diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go index 649f4ee2a0..e360977a82 100644 --- a/coderd/database/queries.sql.go +++ b/coderd/database/queries.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.20.0 +// sqlc v1.24.0 package database diff --git a/coderd/database/sqlc.yaml b/coderd/database/sqlc.yaml index 2ed67c3ac1..f8d45d46a1 100644 --- a/coderd/database/sqlc.yaml +++ b/coderd/database/sqlc.yaml @@ -86,6 +86,8 @@ sql: # schema loaded and migrations run. Run `make sqlc-vet` to run the linter. database: uri: "${SQLC_DATABASE_URL}" + analyzer: + database: false rules: - sqlc/db-prepare gen: diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile index 4e6a091450..d2affb82a0 100644 --- a/dogfood/Dockerfile +++ b/dogfood/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:jammy AS go RUN apt-get update && apt-get install --yes curl gcc # Install Go manually, so that we can control the version -ARG GO_VERSION=1.20.11 +ARG GO_VERSION=1.21.5 RUN mkdir --parents /usr/local/go # Boring Go is needed to build FIPS-compliant binaries. @@ -53,7 +53,7 @@ RUN mkdir --parents "$GOPATH" && \ # charts and values files go install github.com/norwoodj/helm-docs/cmd/helm-docs@v1.5.0 && \ # sqlc for Go code generation - go install github.com/sqlc-dev/sqlc/cmd/sqlc@v1.20.0 && \ + (CGO_ENABLED=1 go install github.com/sqlc-dev/sqlc/cmd/sqlc@v1.24.0) && \ # gcr-cleaner-cli used by CI to prune unused images go install github.com/sethvargo/gcr-cleaner/cmd/gcr-cleaner-cli@v0.5.1 && \ # ruleguard for checking custom rules, without needing to run all of