Skip to content

Commit

Permalink
Add -Werror checks
Browse files Browse the repository at this point in the history
  • Loading branch information
locallycompact committed May 14, 2024
1 parent 6427e5c commit 16a811d
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 7 deletions.
25 changes: 25 additions & 0 deletions .github/workflows/ci-nix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,31 @@ jobs:
body-file: comment-body.md
reactions: rocket

nix-flake-check:
name: "nix flake check"
runs-on: ubuntu-latest
steps:
- name: 📥 Checkout repository
uses: actions/checkout@v4

- name: ❄ Prepare nix
uses: cachix/install-nix-action@v26
with:
extra_nix_config: |
accept-flake-config = true
log-lines = 1000
- name: ❄ Cachix cache of nix derivations
uses: cachix/cachix-action@v14
with:
name: cardano-scaling
authToken: '${{ secrets.CACHIX_CARDANO_SCALING_AUTH_TOKEN }}'

- name: ❄ Nix Flake Check
run: |
nix flake check -L
build-specification:
name: "Build specification using nix"
runs-on: ubuntu-latest
Expand Down
5 changes: 2 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,8 @@ Besides these general build instructions, some components might document
additional steps and useful tools in their `README.md` files, e.g. the
[docs](./docs/README.md) or the [hydra-cluster](./hydra-cluster/README.md)

Warnings are treated as errors for the whole project. To ease development, it
might be handy to it off locally in a `cabal.project.local` with: `cabal
configure --ghc-options -Wwarn`.
While warnings are not treated as errors during builds, CI will check for it
before we merge any contributions.

### Coding standards

Expand Down
4 changes: 0 additions & 4 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ packages:
package *
ghc-options: -j8

-- Warnings as errors for local packages
program-options
ghc-options: -Werror

-- Always build tests and benchmarks of local packages
tests: True
benchmarks: True
Expand Down
11 changes: 11 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@
with pkgs.lib.attrsets;
mapAttrs' (name: value: nameValuePair (s + name) value) attrs;

addWerror = x: x.override { ghcOptions = [ "-Werror" ]; };

in
rec {
legacyPackages = hsPkgs;
Expand Down Expand Up @@ -133,6 +135,15 @@
src = self;
exe = "${packages.plutus-merkle-tree-tests}/bin/tests";
};
hydra-cardano-api-werror = addWerror hsPkgs.hydra-cardano-api.components.library;
hydra-cluster-werror = addWerror hsPkgs.hydra-cluster.components.library;
hydra-chain-observer-werror = addWerror hsPkgs.hydra-chain-observer.components.exes.hydra-chain-observer;
hydra-plutus-werror = addWerror hsPkgs.hydra-plutus.components.library;
hydra-plutus-tests-werror = addWerror hsPkgs.hydra-plutus.components.exes.tests;
hydra-node-werror = addWerror hsPkgs.hydra-node.components.library;
hydra-node-tests-werror = addWerror hsPkgs.hydra-node.components.tests.tests;
hydra-tui-werror = addWerror hsPkgs.hydra-tui.components.library;
hydra-tui-tests-werror = addWerror hsPkgs.hydra-tui.components.tests.tests;
} //
(if pkgs.stdenv.isLinux then
{
Expand Down
1 change: 1 addition & 0 deletions hydra-node/test/Hydra/Model/Payment.hs
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ instance IsTx Payment where
type UTxOType Payment = [(CardanoSigningKey, Value)]
type ValueType Payment = Value
txId = error "undefined"
txSpendingUTxO = error "undefined"
balance = foldMap snd
hashUTxO = encodeUtf8 . show @Text

Expand Down

0 comments on commit 16a811d

Please sign in to comment.