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

Use cabal-install if nix is failing in CI #1859

Merged
merged 8 commits into from
May 24, 2021
Merged

Conversation

berberman
Copy link
Collaborator

We have decided to maintain the nix packaging (building HLS binaries in nix) in #1827. Ideally, we are always have HLS binaries prepared without cabal-install. However, PRs that update project dependencies like #1858 may be blocked by nix ci, since nixpkgs does not have the new dependency yet, and even if it has, a bump of nixpkgs is required. It's unreasonable to require every contributor to handle nix things, so this PR add a fallback in CI, which uses cabal-install to build HLS in case some required packages are missing in nixpkgs.

Also adds default.nix, so that the legacy nix-build can work.

Copy link
Member

@jneira jneira left a comment

Choose a reason for hiding this comment

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

I hope this would unblock #1858 🙂

@berberman
Copy link
Collaborator Author

@jneira Branch protection rules need updates correspondingly

We should remove:

  • nix (macOS-latest)
  • nix (ubuntu-latest)

And add:

  • Nix / develop (ubuntu-latest)
  • Nix / develop (macOS-latest)

@jneira
Copy link
Member

jneira commented May 24, 2021

@jneira Branch protection rules need updates correspondingly

you could do it no yourself right now 🙂 (but i did the change anyways to merge asap)

@jneira jneira merged commit 6606a06 into haskell:master May 24, 2021
@berberman berberman deleted the nix-ci branch May 24, 2021 07:00
Comment on lines +57 to +61
# Build and then push HLS binaries with developmet shell to cachix
# This job runs when PRs are merged to master, and should be excluded from branch protections
build:
runs-on: ${{ matrix.os }}
if: ${{ github.repository_owner == 'haskell' && github.ref == 'ref/heads/master' }}
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

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.

3 participants