mirror of
https://github.com/coder/coder.git
synced 2025-07-13 21:36:50 +00:00
chore: revert nix-related CI changes (#9321)
* chore: revert nix-related CI changes - Reverts using nix to run CI-dependencies. - Running 'make gen' in a dogfood workspace resulted in inconsistent results for protobuf-related files making it difficult to pass CI. This PR imports the minimum changes necessary to make CI compatible with dogfood.
This commit is contained in:
53
.github/workflows/ci.yaml
vendored
53
.github/workflows/ci.yaml
vendored
@ -169,14 +169,35 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
fetch-depth: 1
|
fetch-depth: 1
|
||||||
|
|
||||||
- name: Install Nix
|
- name: Setup Node
|
||||||
uses: DeterminateSystems/nix-installer-action@v4
|
uses: ./.github/actions/setup-node
|
||||||
|
|
||||||
- name: Run the Magic Nix Cache
|
- name: Setup Go
|
||||||
uses: DeterminateSystems/magic-nix-cache-action@v2
|
uses: ./.github/actions/setup-go
|
||||||
|
|
||||||
|
- name: Setup sqlc
|
||||||
|
uses: ./.github/actions/setup-sqlc
|
||||||
|
|
||||||
|
- name: go install tools
|
||||||
|
run: |
|
||||||
|
go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.30
|
||||||
|
go install storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.33
|
||||||
|
go install golang.org/x/tools/cmd/goimports@latest
|
||||||
|
go install github.com/mikefarah/yq/v4@v4.30.6
|
||||||
|
go install github.com/golang/mock/mockgen@v1.6.0
|
||||||
|
|
||||||
|
- name: Install Protoc
|
||||||
|
run: |
|
||||||
|
mkdir -p /tmp/proto
|
||||||
|
pushd /tmp/proto
|
||||||
|
curl -L -o protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v23.3/protoc-23.3-linux-x86_64.zip
|
||||||
|
unzip protoc.zip
|
||||||
|
cp -r ./bin/* /usr/local/bin
|
||||||
|
cp -r ./include /usr/local/bin/include
|
||||||
|
popd
|
||||||
|
|
||||||
- name: make gen
|
- name: make gen
|
||||||
run: "nix-shell --command 'make --output-sync -j -B gen'"
|
run: "make --output-sync -j -B gen"
|
||||||
|
|
||||||
- name: Check for unstaged files
|
- name: Check for unstaged files
|
||||||
run: ./scripts/check_unstaged.sh
|
run: ./scripts/check_unstaged.sh
|
||||||
@ -508,15 +529,27 @@ jobs:
|
|||||||
- name: Setup Terraform
|
- name: Setup Terraform
|
||||||
uses: ./.github/actions/setup-tf
|
uses: ./.github/actions/setup-tf
|
||||||
|
|
||||||
- name: Install Nix
|
- name: go install tools
|
||||||
uses: DeterminateSystems/nix-installer-action@v4
|
run: |
|
||||||
|
go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.30
|
||||||
|
go install storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.33
|
||||||
|
go install golang.org/x/tools/cmd/goimports@latest
|
||||||
|
go install github.com/mikefarah/yq/v4@v4.30.6
|
||||||
|
go install github.com/golang/mock/mockgen@v1.6.0
|
||||||
|
|
||||||
- name: Run the Magic Nix Cache
|
- name: Install Protoc
|
||||||
uses: DeterminateSystems/magic-nix-cache-action@v2
|
run: |
|
||||||
|
mkdir -p /tmp/proto
|
||||||
|
pushd /tmp/proto
|
||||||
|
curl -L -o protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v23.3/protoc-23.3-linux-x86_64.zip
|
||||||
|
unzip protoc.zip
|
||||||
|
cp -r ./bin/* /usr/local/bin
|
||||||
|
cp -r ./include /usr/local/bin/include
|
||||||
|
popd
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
run: |
|
||||||
nix-shell --command 'make -B site/out/index.html'
|
make -B site/out/index.html
|
||||||
|
|
||||||
- run: pnpm playwright:install
|
- run: pnpm playwright:install
|
||||||
working-directory: site
|
working-directory: site
|
||||||
|
4
provisionerd/proto/provisionerd.pb.go
generated
4
provisionerd/proto/provisionerd.pb.go
generated
@ -1,7 +1,7 @@
|
|||||||
// Code generated by protoc-gen-go. DO NOT EDIT.
|
// Code generated by protoc-gen-go. DO NOT EDIT.
|
||||||
// versions:
|
// versions:
|
||||||
// protoc-gen-go v1.31.0
|
// protoc-gen-go v1.30.0
|
||||||
// protoc v3.21.12
|
// protoc v4.23.3
|
||||||
// source: provisionerd/proto/provisionerd.proto
|
// source: provisionerd/proto/provisionerd.proto
|
||||||
|
|
||||||
package proto
|
package proto
|
||||||
|
2
provisionerd/proto/provisionerd_drpc.pb.go
generated
2
provisionerd/proto/provisionerd_drpc.pb.go
generated
@ -1,5 +1,5 @@
|
|||||||
// Code generated by protoc-gen-go-drpc. DO NOT EDIT.
|
// Code generated by protoc-gen-go-drpc. DO NOT EDIT.
|
||||||
// protoc-gen-go-drpc version: (devel)
|
// protoc-gen-go-drpc version: v0.0.33
|
||||||
// source: provisionerd/proto/provisionerd.proto
|
// source: provisionerd/proto/provisionerd.proto
|
||||||
|
|
||||||
package proto
|
package proto
|
||||||
|
4
provisionersdk/proto/provisioner.pb.go
generated
4
provisionersdk/proto/provisioner.pb.go
generated
@ -1,7 +1,7 @@
|
|||||||
// Code generated by protoc-gen-go. DO NOT EDIT.
|
// Code generated by protoc-gen-go. DO NOT EDIT.
|
||||||
// versions:
|
// versions:
|
||||||
// protoc-gen-go v1.31.0
|
// protoc-gen-go v1.30.0
|
||||||
// protoc v3.21.12
|
// protoc v4.23.3
|
||||||
// source: provisionersdk/proto/provisioner.proto
|
// source: provisionersdk/proto/provisioner.proto
|
||||||
|
|
||||||
package proto
|
package proto
|
||||||
|
10
provisionersdk/proto/provisioner_drpc.pb.go
generated
10
provisionersdk/proto/provisioner_drpc.pb.go
generated
@ -1,5 +1,5 @@
|
|||||||
// Code generated by protoc-gen-go-drpc. DO NOT EDIT.
|
// Code generated by protoc-gen-go-drpc. DO NOT EDIT.
|
||||||
// protoc-gen-go-drpc version: (devel)
|
// protoc-gen-go-drpc version: v0.0.33
|
||||||
// source: provisionersdk/proto/provisioner.proto
|
// source: provisionersdk/proto/provisioner.proto
|
||||||
|
|
||||||
package proto
|
package proto
|
||||||
@ -76,6 +76,10 @@ type drpcProvisioner_ParseClient struct {
|
|||||||
drpc.Stream
|
drpc.Stream
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (x *drpcProvisioner_ParseClient) GetStream() drpc.Stream {
|
||||||
|
return x.Stream
|
||||||
|
}
|
||||||
|
|
||||||
func (x *drpcProvisioner_ParseClient) Recv() (*Parse_Response, error) {
|
func (x *drpcProvisioner_ParseClient) Recv() (*Parse_Response, error) {
|
||||||
m := new(Parse_Response)
|
m := new(Parse_Response)
|
||||||
if err := x.MsgRecv(m, drpcEncoding_File_provisionersdk_proto_provisioner_proto{}); err != nil {
|
if err := x.MsgRecv(m, drpcEncoding_File_provisionersdk_proto_provisioner_proto{}); err != nil {
|
||||||
@ -107,6 +111,10 @@ type drpcProvisioner_ProvisionClient struct {
|
|||||||
drpc.Stream
|
drpc.Stream
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (x *drpcProvisioner_ProvisionClient) GetStream() drpc.Stream {
|
||||||
|
return x.Stream
|
||||||
|
}
|
||||||
|
|
||||||
func (x *drpcProvisioner_ProvisionClient) Send(m *Provision_Request) error {
|
func (x *drpcProvisioner_ProvisionClient) Send(m *Provision_Request) error {
|
||||||
return x.MsgSend(m, drpcEncoding_File_provisionersdk_proto_provisioner_proto{})
|
return x.MsgSend(m, drpcEncoding_File_provisionersdk_proto_provisioner_proto{})
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user