Skip to content
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.

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

Fix the static build #123

Merged
merged 7 commits into from
Jun 13, 2022
Merged

Fix the static build #123

merged 7 commits into from
Jun 13, 2022

Conversation

Riscky
Copy link
Contributor

@Riscky Riscky commented Jun 13, 2022

The static build has been broken since 4cd7431, due to a package upgrade.
This PR fixes the static build (big thanks to @FPtje).
The new solution is a lot simpler, so some old cruft has been removed.

This also adds the build script to CI so our master will be green in the future.
The machine type of the CI runner has also been changed, as we need more disk apparently.

@Riscky Riscky requested a review from ReinierMaas June 13, 2022 11:39
Copy link
Contributor

@ReinierMaas ReinierMaas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few small nits but on the overarching picture, this is almost done!

.semaphore/semaphore.yml Outdated Show resolved Hide resolved
glibcLocales = pkgs.glibcLocales;
}).overrideAttrs (prev: {
# Disable the check phase, as hspec-discover will not run.
# TODO: investigate what's happening with hspec-discover.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you still intend to debug the TODOs? Could you make issues otherwise?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both TODO's don't seem overly important.
The first because the tests are run elsewhere anywhere.
The second because it is just a slightly ugly, but still functional, solution.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The hash of the output path changes when the flags on the input side change. So if it could be set to do the testing that is preferred otherwise this can be left as is.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't pick up the tests when enabled.
Since the pkgsStatic.haskellPackages call is, in Falco's words, 'magic', I think I lack the knowledge to debug this.

nix/haskell-overlay.nix Show resolved Hide resolved
vaultenv.nix Outdated Show resolved Hide resolved
@Riscky Riscky requested a review from ReinierMaas June 13, 2022 13:03
Copy link
Contributor

@ReinierMaas ReinierMaas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@Riscky
Copy link
Contributor Author

Riscky commented Jun 13, 2022

@OpsBotPrime merge

@OpsBotPrime
Copy link
Contributor

Pull request approved for merge by @Riscky, rebasing now.

@OpsBotPrime
Copy link
Contributor

Rebased as fb5b672, waiting for CI …

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants