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

Implement new haskell-updates workflow #361143

Open
1 of 4 tasks
sternenseemann opened this issue Dec 2, 2024 · 4 comments
Open
1 of 4 tasks

Implement new haskell-updates workflow #361143

sternenseemann opened this issue Dec 2, 2024 · 4 comments
Labels
0.kind: question Requests for a specific question to be answered 6.topic: haskell 6.topic: policy discussion

Comments

@sternenseemann
Copy link
Member

sternenseemann commented Dec 2, 2024

For the discussion that led to this, see #354270.

I think an uncontroversial way forward would be to do the following going forward:

  • Base haskell-updates PRs on master for fast testing on Hydra.
  • Merge haskell-updates into staging as a general rule. When staging-next is in an early phase we can consider merging it into staging-next on a case per case basis.

Outstanding tasks to make this happen (not sure if this is exhaustive?!):

  • Finish haskellPackages: update stackage and hackage #354270 and the following staging-next rotation. Unfortunately, the PR is currently based on staging.
  • Update the maintainer documentation, i.e. HACKING.md.
  • Update the merge-and-open-pr.sh maintainer script
  • Update periodic-merge-24h.yml to merge the merge base of staging and master into haskell-updates to prevent haskell-updates from being ahead of staging. This should be possible with GitHub action's outputs from jobs, but I don't know how it'd precisely work.

cc @NixOS/haskell @vcunat @K900

@maralorn
Copy link
Member

maralorn commented Dec 2, 2024

I am in favor!

@mpscholten
Copy link
Contributor

In the other thread you suggested getting rid of shellsheck:

Clamp down on the use of writeShellApplication in nixpkgs. Executing shellcheck can be done in passthru.tests for nixpkgs, so I don't really see why it needs to be used in this way, it currently is. Even without the unfortunate situation with haskell-updates, this would reduce rebuild time for a lot of packages probably.

Given this would reduce rebuild time for a lot of packages probably, why was this idea discarded?

@sternenseemann
Copy link
Member Author

It's not a permanent solution, as it would mean enforcing some kind of dependency discipline in nixpkgs. There's really nothing to prevent other projects from depending on Haskell packages. It would be silly if we had to disable e.g. documentation generated using pandoc just so that we can keep merging haskell-updates into master.

sternenseemann added a commit to sternenseemann/nixpkgs that referenced this issue Dec 23, 2024
Since haskell-updates is based on master, but merges into staging, we
need to base it on a merge-base of staging and master. See NixOS#361143.

I'm a bit worried that the information GitHub uses for displaying
Pull-Requests becomes stale and this will “add” commits to the PR
compared to the base anyways. We'll find out, I suppose.
@sternenseemann
Copy link
Member Author

#367709

sternenseemann added a commit to sternenseemann/nixpkgs that referenced this issue Dec 24, 2024
Since haskell-updates is based on master, but merges into staging, we
need to base it on a merge-base of staging and master. See NixOS#361143.

I'm a bit worried that the information GitHub uses for displaying
Pull-Requests becomes stale and this will “add” commits to the PR
compared to the base anyways. We'll find out, I suppose.
sternenseemann added a commit to sternenseemann/nixpkgs that referenced this issue Dec 26, 2024
Since haskell-updates is based on master, but merges into staging, we
need to base it on a merge-base of staging and master. See NixOS#361143.

I'm a bit worried that the information GitHub uses for displaying
Pull-Requests becomes stale and this will “add” commits to the PR
compared to the base anyways. We'll find out, I suppose.
sternenseemann added a commit to sternenseemann/nixpkgs that referenced this issue Dec 26, 2024
Since haskell-updates is based on master, but merges into staging, we
need to base it on a merge-base of staging and master. See NixOS#361143.

I'm a bit worried that the information GitHub uses for displaying
Pull-Requests becomes stale and this will “add” commits to the PR
compared to the base anyways. We'll find out, I suppose.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0.kind: question Requests for a specific question to be answered 6.topic: haskell 6.topic: policy discussion
Development

No branches or pull requests

3 participants