Skip to content

workflows/periodic-merge: update haskell-updates PR's base branch - #523160

Merged
wolfgangwalther merged 2 commits into
NixOS:masterfrom
wolfgangwalther:ci-haskell-updates-target
May 25, 2026
Merged

workflows/periodic-merge: update haskell-updates PR's base branch#523160
wolfgangwalther merged 2 commits into
NixOS:masterfrom
wolfgangwalther:ci-haskell-updates-target

Conversation

@wolfgangwalther

@wolfgangwalther wolfgangwalther commented May 22, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

This gives us better UI in the PR by hiding the commits that are already on the base branch (mostly staging) after the periodic merge. Without this, the PR has 100s of commits listed after a few days.

Resolves / based on #521260 (comment)

Things done

@wolfgangwalther wolfgangwalther mentioned this pull request May 22, 2026
Draft
@nixpkgs-ci
nixpkgs-ci Bot requested a review from a team May 22, 2026 21:50
@nixpkgs-ci nixpkgs-ci Bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions 6.topic: policy discussion Discuss policies to work in and around Nixpkgs backport release-25.11 labels May 22, 2026
mdaniels5757
mdaniels5757 reviewed May 23, 2026
View reviewed changes
Comment thread .github/workflows/periodic-merge-24h.yml Outdated
@wolfgangwalther
workflows/periodic-merge: allow testing in forks
fe5cea9 
Manually dispatching in your fork should still trigger the workflow to
test.
@wolfgangwalther
wolfgangwalther force-pushed the ci-haskell-updates-target branch from adb5cf2 to ff9cba4 Compare May 24, 2026 21:33
@wolfgangwalther

wolfgangwalther commented May 24, 2026

Copy link
Copy Markdown
Contributor Author

I tested it in my fork, it seems to work as expected. Ready to go from my perspective.

@nixpkgs-ci nixpkgs-ci Bot added the backport release-26.05 Backport PR automatically label May 24, 2026
MattSturgeon
MattSturgeon reviewed May 24, 2026
View reviewed changes
Comment thread .github/workflows/periodic-merge-24h.yml Outdated
@wolfgangwalther
workflows/periodic-merge: update haskell-updates PR's base branch
5439176 
This gives us better UI in the PR by hiding the commits that are already
on the base branch (mostly staging) after the periodic merge. Without
this, the PR has 100s of commits listed after a few days.
@wolfgangwalther
wolfgangwalther force-pushed the ci-haskell-updates-target branch from ff9cba4 to 5439176 Compare May 24, 2026 22:03
MattSturgeon
MattSturgeon approved these changes May 24, 2026
View reviewed changes

@MattSturgeon MattSturgeon left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Diff SGTM, not tested.

That means... my test must have also been inconclusive. The workflow did at least not throw an error, but I probably did not test whether the branch was reset at all. Odd, my test PR did not show any of the merged-in commits. hmmm

Would you like to hold off merging until you've re-tested, or are you confident merging the latest revision?

@nixpkgs-ci nixpkgs-ci Bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label May 24, 2026
@wolfgangwalther

wolfgangwalther commented May 25, 2026

Copy link
Copy Markdown
Contributor Author

Would you like to hold off merging until you've re-tested, or are you confident merging the latest revision?

Since it's a bit hard to test, even with the first commit in this PR, I'm fine with merging it as is. It can't break any existing workflow, and we should know by tomorrow whether it works :)

@wolfgangwalther
wolfgangwalther added this pull request to the merge queue May 25, 2026
Merged via the queue into NixOS:master with commit 6d5b932 May 25, 2026
28 checks passed
@wolfgangwalther
wolfgangwalther deleted the ci-haskell-updates-target branch May 25, 2026 08:05
@nixpkgs-ci nixpkgs-ci Bot mentioned this pull request May 25, 2026
Merged
@nixpkgs-ci

nixpkgs-ci Bot commented May 25, 2026

Copy link
Copy Markdown
Contributor

Successfully created backport PR for release-25.11:

@nixpkgs-ci nixpkgs-ci Bot mentioned this pull request May 25, 2026
Merged
@nixpkgs-ci

nixpkgs-ci Bot commented May 25, 2026

Copy link
Copy Markdown
Contributor

Successfully created backport PR for release-26.05:

@github-actions github-actions Bot added the 8.has: port to stable This PR already has a backport to the stable release. label May 25, 2026
@wolfgangwalther

wolfgangwalther commented May 25, 2026

Copy link
Copy Markdown
Contributor Author

I just tested it by triggering the 24h workflow manually - it works. #521260 is nice and tidy and only shows the merge commit, but not all the others. Nice.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mdaniels5757 mdaniels5757 mdaniels5757 left review comments
@MattSturgeon MattSturgeon MattSturgeon approved these changes
@sternenseemann sternenseemann Awaiting requested review from sternenseemann

Assignees

No one assigned

Labels

6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions 6.topic: policy discussion Discuss policies to work in and around Nixpkgs 8.has: port to stable This PR already has a backport to the stable release. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person. backport release-26.05 Backport PR automatically

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@wolfgangwalther @MattSturgeon @mdaniels5757