Skip to content

Commit

Permalink
Merge pull request #1133 from input-output-hk/abailly-iohk/fix-buildi…
Browse files Browse the repository at this point in the history
…ng-static-and-docker-in-ci

Fix static and docker builds
  • Loading branch information
Arnaud Bailly authored Oct 20, 2023
2 parents e54fe5d + cb2a3c7 commit d5cbe26
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/static_binary.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ name: Static executable

on:
push:
branches: [ "master" ]
tags: [ "*.*.*" ]
branches:
- "**"
tags:
- "*.*.*"

jobs:
build-executables:
Expand Down
7 changes: 7 additions & 0 deletions nix/hydra/project.nix
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,13 @@ let
# XXX: Could not figure out where to make this flag ^^^ effective in the haddock build
packages.strict-containers.doHaddock = false;
}
({ lib, config, ... }:
lib.mkIf (lib.versionAtLeast config.compiler.version "9.4") {
# lib:ghc is a bit annoying in that it comes with it's own build-type:Custom, and then tries
# to call out to all kinds of silly tools that GHC doesn't really provide.
# For this reason, we try to get away without re-installing lib:ghc for now.
reinstallableLibGhc = false;
})
];
};
in
Expand Down

0 comments on commit d5cbe26

Please sign in to comment.