Skip to content

Commit e0df6c5

Browse files
Add jq and websocat, split up lib and examples build
1 parent cdd4c0a commit e0df6c5

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

.github/workflows/integrate.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,4 @@ jobs:
7676
dist-newstyle
7777
key: ${{ runner.os }}-cabal
7878
- name: Build the full ci derivation
79-
run: make nix_build
79+
run: make nix_build_lib && make nix_build_examples

Makefile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# In most cases you should execute Make after entering nix-shell.
44

55
.PHONY: hoogle pab_servers_all pab_servers_all pab_db clean_db \
6-
nix_build build test accept_pirs watch ghci readme_contents \
6+
nix_build_lib nix_build_examples build test accept_pirs watch ghci readme_contents \
77
format lint requires_nix_shell
88

99
usage:
@@ -16,7 +16,8 @@ usage:
1616
@echo
1717
@echo "Available commands:"
1818
@echo " hoogle -- Start local hoogle"
19-
@echo " nix_build -- Run nix build -L on all targets"
19+
@echo " nix_build_lib -- Run nix build -L on the library and tests"
20+
@echo " nix_build_examples -- Run nix build -L on all examples"
2021
@echo " build -- Run cabal v2-build"
2122
@echo " watch -- Track files: bot-plutus-interface.cabal, src/* and run 'make build' on change"
2223
@echo " test -- Run cabal v2-test"
@@ -45,8 +46,11 @@ ifdef FLAGS
4546
GHC_FLAGS = --ghc-options "$(FLAGS)"
4647
endif
4748

48-
nix_build:
49-
nix build -L .#check.x86_64-linux .#plutus-transfer:exe:plutus-transfer-pab .#plutus-game:exe:plutus-game-pab .#plutus-nft:exe:plutus-nft-pab
49+
nix_build_lib:
50+
nix build -L .#check.x86_64-linux
51+
52+
nix_build_examples:
53+
nix build -L .#plutus-transfer:exe:plutus-transfer-pab .#plutus-game:exe:plutus-game-pab .#plutus-nft:exe:plutus-nft-pab
5054

5155
build: requires_nix_shell
5256
cabal v2-build $(GHC_FLAGS)

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
# We use the ones from Nixpkgs, since they are cached reliably.
6969
# Eventually we will probably want to build these with haskell.nix.
7070
nativeBuildInputs =
71-
[ pkgs.cabal-install pkgs.hlint pkgs.haskellPackages.fourmolu ];
71+
[ pkgs.cabal-install pkgs.hlint pkgs.haskellPackages.fourmolu pkgs.jq pkgs.websocat ];
7272

7373
additional = ps: [
7474
ps.base-deriving-via

0 commit comments

Comments
 (0)