Move ci-checks.sh to a make target:

This allows us to check for nix-shell and use docker if nix-shell is not installed. Update CI to use the make target. Signed-off-by: Jacob Weinstock <[email protected]>
tinkerbell · May 10, 2023 · 57fcd75 · 57fcd75
1 parent 54a6f1c
commit 57fcd75
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -45,8 +45,8 @@ jobs:
         uses: cachix/install-nix-action@v20
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - run: nix-shell --run 'true'
-      - run: PATH=$PWD/bin/:$PATH ./ci-checks.sh
+      - name: Run ci-checks.sh
+        run: nix-shell --run 'make ci-checks'
   # We preemptively build the binaries for efficiency instead of waiting on unit tests to pass
   # hence this doesn't depend on anything.
   build:

diff --git a/Makefile b/Makefile
@@ -177,6 +177,14 @@ check-proto: generate-proto
 verify: lint check-generated ## Verify code style, is lint free, freshness ...
 	$(GOFUMPT) -s -d .
 
+.PHONY: ci-checks
+ci-checks: ## Run ci-checks.sh script
+	@if type nix-shell 2>&1 > /dev/null; then \
+		./ci-checks.sh; \
+	else \
+		docker run -it --rm -v $${PWD}:/code -w /code nixos/nix nix-shell --run 'make ci-checks'; \
+	fi
+
 .PHONY: lint
 lint: shellcheck hadolint golangci-lint yamllint ## Lint code