From 0059b4712a55e06e156d6b75aa6d0e8f526b9672 Mon Sep 17 00:00:00 2001 From: David Wahler Date: Thu, 19 May 2022 22:17:22 +0000 Subject: [PATCH 1/2] fix: manually fix coderd/database/dump.sql and make style/gen check run more reliably --- .github/workflows/coder.yaml | 2 +- coderd/database/dump.sql | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/coder.yaml b/.github/workflows/coder.yaml index c23b46b57e74a..90fe74c411960 100644 --- a/.github/workflows/coder.yaml +++ b/.github/workflows/coder.yaml @@ -105,7 +105,7 @@ jobs: - run: go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.26 - run: go install storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.26 - run: go install golang.org/x/tools/cmd/goimports@latest - - run: "make --output-sync -j gen" + - run: "make --output-sync -j -B gen" - run: ./scripts/check_unstaged.sh style-fmt: diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql index 40362564c158b..4cd90454283d7 100644 --- a/coderd/database/dump.sql +++ b/coderd/database/dump.sql @@ -483,3 +483,4 @@ ALTER TABLE ONLY workspaces ALTER TABLE ONLY workspaces ADD CONSTRAINT workspaces_template_id_fkey FOREIGN KEY (template_id) REFERENCES templates(id) ON DELETE RESTRICT; + From 5eb9deafe7aeda1fffeb944b2cd19122033bf102 Mon Sep 17 00:00:00 2001 From: David Wahler Date: Thu, 19 May 2022 22:25:36 +0000 Subject: [PATCH 2/2] Regenerate protoc-gen-go output --- provisionerd/proto/provisionerd.pb.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provisionerd/proto/provisionerd.pb.go b/provisionerd/proto/provisionerd.pb.go index aec1bfe147bbb..639e0d4bd1135 100644 --- a/provisionerd/proto/provisionerd.pb.go +++ b/provisionerd/proto/provisionerd.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.19.4 +// protoc v3.20.0 // source: provisionerd/proto/provisionerd.proto package proto