Merge branch 'main' into dependabot/go_modules/google.golang.org/grpc…

…-1.55.0
tinkerbell · May 10, 2023 · 00ff516 · 00ff516
2 parents 33599e7 + 7be72c7
commit 00ff516
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 21 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
 

diff --git a/shell.nix b/shell.nix
@@ -9,29 +9,11 @@ in { pkgs ? import (_pkgs.fetchFromGitHub {
 
 with pkgs;
 
-let
-  pkgs = import (_pkgs.fetchFromGitHub {
-    # go 1.18.5
-    owner = "NixOS";
-    repo = "nixpkgs";
-    # branch@date: nixpkgs-unstable@2023-03-30
-    rev = "8b3bc690e201c8d3cbd14633dbf3462a820e73f2";
-    sha256 = "sha256-+ckiCxbGFSs1/wHKCXAZnvb37Htf6k5nmQE3T0Y7hK8=";
-  }) { };
-
-  go_1_20_3 = pkgs.go;
-
-in mkShell {
+mkShell {
   buildInputs = [
-    docker-compose
-    git
-    gnumake
-    gnused
-    go_1_20_3
     jq
     nixfmt
     nodePackages.prettier
-    protobuf
     python3Packages.codespell
     python3Packages.pip
     python3Packages.setuptools