From b55ce6497eaf87d53530c8dfc3118467a0a38c09 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Tue, 15 Aug 2023 15:43:30 +0100 Subject: [PATCH 1/4] chore(dogfood): update sqlc to version 1.20.0 --- coderd/database/models.go | 2 +- coderd/database/querier.go | 2 +- coderd/database/queries.sql.go | 2 +- dogfood/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coderd/database/models.go b/coderd/database/models.go index 0c1b4a7002227..b51671afaa5da 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.19.1 +// sqlc v1.20.0 package database diff --git a/coderd/database/querier.go b/coderd/database/querier.go index 46e45b693236c..7280617ef878f 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.19.1 +// sqlc v1.20.0 package database diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go index e8e77cbfaa02f..a7cf539b3bc6a 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.19.1 +// sqlc v1.20.0 package database diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile index f269962369ef9..8f156bd5152e8 100644 --- a/dogfood/Dockerfile +++ b/dogfood/Dockerfile @@ -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/kyleconroy/sqlc/cmd/sqlc@v1.19.1 && \ + go install github.com/sqlc-dev/sqlc/cmd/sqlc@v1.20.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 From 300f6fcf5fa0489711b61501cbbfa9e73aaed5c1 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Tue, 15 Aug 2023 16:28:09 +0100 Subject: [PATCH 2/4] fixup! chore(dogfood): update sqlc to version 1.20.0 --- .github/actions/setup-sqlc/action.yaml | 2 +- .github/workflows/ci.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/setup-sqlc/action.yaml b/.github/actions/setup-sqlc/action.yaml index 354e55e8213f6..d109a50f52f75 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@v3 with: - sqlc-version: "1.19.1" + sqlc-version: "1.20.0" diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b383d0ebcf3ef..9bd226f5ee1a7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -642,7 +642,7 @@ jobs: - name: Setup sqlc uses: sqlc-dev/setup-sqlc@v3 with: - sqlc-version: "1.19.1" + sqlc-version: "1.20.0" - name: Format run: | From c4745b10ed3e9636b9bff76cd2c22de3012245ef Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Tue, 15 Aug 2023 20:37:29 +0100 Subject: [PATCH 3/4] address PR comment --- .github/workflows/ci.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9bd226f5ee1a7..0955e202bd8fe 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -641,8 +641,6 @@ jobs: - name: Setup sqlc uses: sqlc-dev/setup-sqlc@v3 - with: - sqlc-version: "1.20.0" - name: Format run: | From 848f82e1e9c8cc5e25e35c01d46c1dbdc567d645 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Tue, 15 Aug 2023 20:42:46 +0100 Subject: [PATCH 4/4] fixup! address PR comment --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0955e202bd8fe..faec06db46f30 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -640,7 +640,7 @@ jobs: go install github.com/golang/mock/mockgen@v1.6.0 - name: Setup sqlc - uses: sqlc-dev/setup-sqlc@v3 + uses: ./.github/actions/setup-sqlc - name: Format run: |