Skip to content

Add jq and websocat, split up lib and examples build #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 22, 2022
+10 −6
Merged

Add jq and websocat, split up lib and examples build #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0df6c5
Add jq and websocat, split up lib and examples build
samuelWilliams99 Feb 22, 2022
68653a3
Merge branch 'master' into sam/examples-build
samuelWilliams99 Feb 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/integrate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,4 @@ jobs:
dist-newstyle
key: ${{ runner.os }}-cabal
- name: Build the full ci derivation
run: make nix_build
run: make nix_build_lib && make nix_build_examples
12 changes: 8 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# In most cases you should execute Make after entering nix-shell.

.PHONY: hoogle pab_servers_all pab_servers_all pab_db clean_db \
nix_build build test accept_pirs watch ghci readme_contents \
nix_build_lib nix_build_examples build test accept_pirs watch ghci readme_contents \
format lint requires_nix_shell

usage:
Expand All @@ -16,7 +16,8 @@ usage:
@echo
@echo "Available commands:"
@echo " hoogle -- Start local hoogle"
@echo " nix_build -- Run nix build -L on all targets"
@echo " nix_build_lib -- Run nix build -L on the library and tests"
@echo " nix_build_examples -- Run nix build -L on all examples"
@echo " build -- Run cabal v2-build"
@echo " watch -- Track files: bot-plutus-interface.cabal, src/* and run 'make build' on change"
@echo " test -- Run cabal v2-test"
Expand Down Expand Up @@ -45,8 +46,11 @@ ifdef FLAGS
GHC_FLAGS = --ghc-options "$(FLAGS)"
endif

nix_build:
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
nix_build_lib:
nix build -L .#check.x86_64-linux

nix_build_examples:
nix build -L .#plutus-transfer:exe:plutus-transfer-pab .#plutus-game:exe:plutus-game-pab .#plutus-nft:exe:plutus-nft-pab

build: requires_nix_shell
cabal v2-build $(GHC_FLAGS)
Expand Down
2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
# We use the ones from Nixpkgs, since they are cached reliably.
# Eventually we will probably want to build these with haskell.nix.
nativeBuildInputs =
[ pkgs.cabal-install pkgs.hlint pkgs.haskellPackages.fourmolu ];
[ pkgs.cabal-install pkgs.hlint pkgs.haskellPackages.fourmolu pkgs.jq pkgs.websocat ];

additional = ps: [
ps.base-deriving-via
Expand Down