Skip to content

workflows/labels: skip for staging-next / haskell-updates / python-updates#402332

Merged
wolfgangwalther merged 2 commits intoNixOS:masterfrom
wolfgangwalther:ci-no-label-staging-next
May 4, 2025
Merged

workflows/labels: skip for staging-next / haskell-updates / python-updates#402332
wolfgangwalther merged 2 commits intoNixOS:masterfrom
wolfgangwalther:ci-no-label-staging-next

Conversation

@wolfgangwalther
Copy link
Contributor

@wolfgangwalther wolfgangwalther commented Apr 27, 2025

Labeling those PRs is more annoying then useful.

Things done

(not tested, yet)


Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 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-24.11 labels Apr 27, 2025
@github-actions github-actions 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. labels Apr 27, 2025
@sternenseemann
Copy link
Member

This means we loose the python label on python-updates and the haskell one on haskell-updates, though? We should probably figure out whether we can preserve them.

@wolfgangwalther
Copy link
Contributor Author

This means we loose the python label on python-updates and the haskell one on haskell-updates, though? We should probably figure out whether we can preserve them.

Makes sense. Maybe we can add a "staging" label as well, which can be used to find staging-next / staging-xx.yy-next PRs quickly. Using head:staging-next isn't exact unfortunately, because it will match the fork's branch names, too.

@wolfgangwalther wolfgangwalther force-pushed the ci-no-label-staging-next branch from 00cb10d to b22f888 Compare May 2, 2025 17:26
@wolfgangwalther
Copy link
Contributor Author

wolfgangwalther commented May 2, 2025

I made some changes to keep the haskell/python topic labels for those branches. I also propose to add the following entirely new labels:

  • "4.workflow: backport" can be used to filter everything targeting the stable branches, both release-XX.YY or staging-XX.YY.
  • "4.workflow: package set updates" can be used to filter the haskell/python package set PRs. Can be combined with "6.topic: haskell" or "6.topic: python".
  • "4.workflow: staging" can be used to filter for all staging-next PRs, both to master and release branches.

Feedback welcome!

@wolfgangwalther wolfgangwalther force-pushed the ci-no-label-staging-next branch from b22f888 to 68f1801 Compare May 2, 2025 17:30
@wegank wegank added 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. 12.approvals: 1 This PR was reviewed and approved by one person. labels May 4, 2025
…dates

Labelling those PRs is more annoying then useful.
This adds some labels related to the higher level workflows of
developing nixpkgs:
- "4.workflow: backport" can be used to filter everything targeting the
stable branches, both release-XX.YY or staging-XX.YY.
- "4.workflow: package set updates" can be used to filter the
haskell/python package set PRs. Can be combined with "6.topic: haskell"
or "6.topic: python".
- "4.workflow: staging" can be used to filter for all staging-next PRs,
both to master and release branches.
@wolfgangwalther wolfgangwalther force-pushed the ci-no-label-staging-next branch from 68f1801 to 5ed0205 Compare May 4, 2025 11:55
@wolfgangwalther
Copy link
Contributor Author

I created the labels, let's see how it goes.

@wolfgangwalther wolfgangwalther merged commit 1b6b151 into NixOS:master May 4, 2025
21 of 25 checks passed
@wolfgangwalther wolfgangwalther deleted the ci-no-label-staging-next branch May 4, 2025 12:01
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented May 4, 2025

Backport failed for release-24.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.11
git worktree add -d .worktree/backport-402332-to-release-24.11 origin/release-24.11
cd .worktree/backport-402332-to-release-24.11
git switch --create backport-402332-to-release-24.11
git cherry-pick -x 19095200155c0164eeb1629d3ad5f2a53ad40e15 5ed0205f6a9f6b1939c5b9caf835c368b578fb62

@wolfgangwalther
Copy link
Contributor Author

Backport in #404107.

@wolfgangwalther
Copy link
Contributor Author

Seems like this didn't work, yet. Workflow run after the merge into staging-next: https://github.com/NixOS/nixpkgs/actions/runs/14821411700/job/41608868160?pr=401526

The first two steps are running, but not the third.

wolfgangwalther added a commit to wolfgangwalther/nixpkgs that referenced this pull request May 4, 2025
Introduced in NixOS#402332, but head.repo is an object, not a string.
@wolfgangwalther wolfgangwalther added the 2.status: needs-changes This PR needs changes by the author label May 4, 2025
@wolfgangwalther wolfgangwalther restored the ci-no-label-staging-next branch May 4, 2025 14:48
@wolfgangwalther wolfgangwalther deleted the ci-no-label-staging-next branch May 4, 2025 14:48
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented May 4, 2025

Backport failed for release-24.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.11
git worktree add -d .worktree/backport-402332-to-release-24.11 origin/release-24.11
cd .worktree/backport-402332-to-release-24.11
git switch --create backport-402332-to-release-24.11
git cherry-pick -x 19095200155c0164eeb1629d3ad5f2a53ad40e15 5ed0205f6a9f6b1939c5b9caf835c368b578fb62

wolfgangwalther added a commit to wolfgangwalther/nixpkgs that referenced this pull request May 4, 2025
Introduced in NixOS#402332, but head.repo is an object, not a string.
wolfgangwalther added a commit to wolfgangwalther/nixpkgs that referenced this pull request May 4, 2025
Introduced in NixOS#402332, but broken on all ends:
- pull_request needs to be event.pull_request
- pull_request.head is an object, not a string
- github.ref_protected is about the target branch, because this runs as
a pull_request_target event

Thus, we need to list the branches manually.
wolfgangwalther added a commit to wolfgangwalther/nixpkgs that referenced this pull request May 4, 2025
Introduced in NixOS#402332, but broken on all ends:
- pull_request needs to be event.pull_request
- pull_request.head is an object, not a string
- github.ref_protected is about the target branch, because this runs as
a pull_request_target event

Thus, we need to list the branches manually.

(cherry picked from commit e676235)
@wolfgangwalther
Copy link
Contributor Author

I have added workflow staging / workflow package set update labels to the already closed PRs from the 24.11 cycle retroactively. Thus, it's possible to filter those easily now.

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

Labels

2.status: needs-changes This PR needs changes by the author 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 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. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants