From 0328bcd3025d46e22213f93d39eb06eecbc0dd3f Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 9 Jan 2024 15:45:24 -0900 Subject: [PATCH 1/3] chore: update sqlc to 1.25.0 The flake.lock was updated and now uses sqlc 1.25.0, so update the Dockerfile to match and regen. --- 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 e8c8ae2c31e50..cf9d8caaaea48 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.24.0 +// sqlc v1.25.0 package database diff --git a/coderd/database/querier.go b/coderd/database/querier.go index 3d2631c49f65f..e32c106787a13 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.24.0 +// sqlc v1.25.0 package database diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go index 81bbe52386cf9..f9287915d5438 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.24.0 +// sqlc v1.25.0 package database diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile index 67a3212904817..2b2bc8897d32f 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 - (CGO_ENABLED=1 go install github.com/sqlc-dev/sqlc/cmd/sqlc@v1.24.0) && \ + (CGO_ENABLED=1 go install github.com/sqlc-dev/sqlc/cmd/sqlc@v1.25.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 ae2f84f4fea60fc208be5830d39dd9fec2880a39 Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 9 Jan 2024 15:54:41 -0900 Subject: [PATCH 2/3] chore: update sqlc in github action --- .github/actions/setup-sqlc/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-sqlc/action.yaml b/.github/actions/setup-sqlc/action.yaml index 151970389f1bd..544d2d4ce923c 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.24.0" + sqlc-version: "1.25.0" From 52f4ca4fc907dd81df209abb1755d42cd6d0341f Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Wed, 10 Jan 2024 08:48:16 +0300 Subject: [PATCH 3/3] use docker buildx as a fallback --- .github/workflows/dogfood.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/dogfood.yaml b/.github/workflows/dogfood.yaml index 9558b14b043cb..be349833a60e4 100644 --- a/.github/workflows/dogfood.yaml +++ b/.github/workflows/dogfood.yaml @@ -35,6 +35,9 @@ jobs: - name: Set up Depot CLI uses: depot/setup-action@v1 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Login to DockerHub if: github.ref == 'refs/heads/main' uses: docker/login-action@v3 @@ -47,6 +50,7 @@ jobs: with: project: b4q6ltmpzh token: ${{ secrets.DEPOT_TOKEN }} + buildx-fallback: true context: "{{defaultContext}}:dogfood" pull: true push: ${{ github.ref == 'refs/heads/main' }}