Skip to content

Commit 3f5cefe

Browse files
committed
chore: revert CI
- 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.
1 parent 7f14b50 commit 3f5cefe

File tree

1 file changed

+27
-12
lines changed

1 file changed

+27
-12
lines changed

.github/workflows/ci.yaml

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -169,14 +169,35 @@ jobs:
169169
with:
170170
fetch-depth: 1
171171

172-
- name: Install Nix
173-
uses: DeterminateSystems/nix-installer-action@v4
172+
- name: Setup Node
173+
uses: ./.github/actions/setup-node
174+
175+
- name: Setup Go
176+
uses: ./.github/actions/setup-go
177+
178+
- name: Setup sqlc
179+
uses: ./.github/actions/setup-sqlc
174180

175-
- name: Run the Magic Nix Cache
176-
uses: DeterminateSystems/magic-nix-cache-action@v2
181+
- name: go install tools
182+
run: |
183+
go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.30
184+
go install storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.33
185+
go install golang.org/x/tools/cmd/goimports@latest
186+
go install github.com/mikefarah/yq/v4@v4.30.6
187+
go install github.com/golang/mock/mockgen@v1.6.0
188+
189+
- name: Install Protoc
190+
run: |
191+
mkdir -p /tmp/proto
192+
pushd /tmp/proto
193+
curl -L -o protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v23.3/protoc-23.3-linux-x86_64.zip
194+
unzip protoc.zip
195+
cp -r ./bin/* /usr/local/bin
196+
cp -r ./include /usr/local/bin/include
197+
popd
177198
178199
- name: make gen
179-
run: "nix-shell --command 'make --output-sync -j -B gen'"
200+
run: "make --output-sync -j -B gen"
180201

181202
- name: Check for unstaged files
182203
run: ./scripts/check_unstaged.sh
@@ -508,15 +529,9 @@ jobs:
508529
- name: Setup Terraform
509530
uses: ./.github/actions/setup-tf
510531

511-
- name: Install Nix
512-
uses: DeterminateSystems/nix-installer-action@v4
513-
514-
- name: Run the Magic Nix Cache
515-
uses: DeterminateSystems/magic-nix-cache-action@v2
516-
517532
- name: Build
518533
run: |
519-
nix-shell --command 'make -B site/out/index.html'
534+
make -B site/out/index.html
520535
521536
- run: pnpm playwright:install
522537
working-directory: site

0 commit comments

Comments
 (0)