Skip to content

Commit c00fca7

Browse files
committed
Convert gen to use Nix
1 parent 600e9b2 commit c00fca7

File tree

2 files changed

+4
-31
lines changed

2 files changed

+4
-31
lines changed

.github/workflows/ci.yaml

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

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
180-
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-
# protoc must be in lockstep with our dogfood Dockerfile or the
192-
# version in the comments will differ. This is also defined in
193-
# security.yaml
194-
set -x
195-
cd dogfood
196-
DOCKER_BUILDKIT=1 docker build . --target proto -t protoc
197-
protoc_path=/usr/local/bin/protoc
198-
docker run --rm --entrypoint cat protoc /tmp/bin/protoc > $protoc_path
199-
chmod +x $protoc_path
200-
protoc --version
172+
- uses: cachix/install-nix-action@v22
173+
with:
174+
nix_path: nixpkgs=channel:nixos-unstable
201175

202176
- name: make gen
203-
run: "make --output-sync -j -B gen"
177+
run: "nix-shell --command 'make --output-sync -j -B gen'"
204178

205179
- name: Check for unstaged files
206180
run: ./scripts/check_unstaged.sh

.github/workflows/dogfood.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ jobs:
3939
4040
- uses: cachix/install-nix-action@v22
4141
with:
42-
github_access_token: ${{ secrets.GITHUB_TOKEN }}
4342
nix_path: nixpkgs=channel:nixos-unstable
4443

4544
- run: nix build .#devEnvImage && ./result | docker load

0 commit comments

Comments
 (0)