From 55b046451c118c858e8ae3aa6dd9b198bf0f6704 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 22 Aug 2025 17:18:02 +0200 Subject: [PATCH] ci: remove python-updates from development branches The python-updates branch is not a "development" branch in the sense of ci/README.md's classification. That's because it allows force pushes. When rewrites are possible, cherry-picking from this branch should not be allowed, because the commit references will potentially end up out of sync. These kind of branches are now termed "Work-in-Progress" branches. Up until recently these branches didn't work well for Pull Requests targeting them, because Eval wouldn't run on them with a push event and thus, Eval in the PR couldn't succeed either. That's now fixed, PRs towards *any* WIP branch should work correctly. --- .github/workflows/push.yml | 1 - ci/README.md | 2 +- ci/request-reviews/dev-branches.txt | 1 - ci/supportedBranches.js | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 265f0fba8927..4031c3a9cc6f 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -13,7 +13,6 @@ on: - release-* - staging-* - haskell-updates - - python-updates permissions: {} diff --git a/ci/README.md b/ci/README.md index c55d0ca62d07..797f231aea62 100644 --- a/ci/README.md +++ b/ci/README.md @@ -36,7 +36,7 @@ For the purposes of CI, branches in the NixOS/nixpkgs repository are classified - Pull Requests required. - Long-lived, no deletion, no force push. - **Secondary development** branches - - `staging-` prefix, `haskell-updates` and `python-updates` + - `staging-` prefix and `haskell-updates` - Pull Requests normally required, except when merging development branches into each other. - Long-lived, no deletion, no force push. - **Work-In-Progress** branches diff --git a/ci/request-reviews/dev-branches.txt b/ci/request-reviews/dev-branches.txt index 9e0609e325ec..b34092546f18 100644 --- a/ci/request-reviews/dev-branches.txt +++ b/ci/request-reviews/dev-branches.txt @@ -6,4 +6,3 @@ staging release-* staging-* haskell-updates -python-updates diff --git a/ci/supportedBranches.js b/ci/supportedBranches.js index d1a826e89147..fd7dcc9144f3 100755 --- a/ci/supportedBranches.js +++ b/ci/supportedBranches.js @@ -9,7 +9,6 @@ const typeConfig = { staging: ['development', 'secondary'], 'staging-next': ['development', 'secondary'], 'haskell-updates': ['development', 'secondary'], - 'python-updates': ['development', 'secondary'], nixos: ['channel'], nixpkgs: ['channel'], }