summary refs log tree commit diff
path: root/.github
diff options
context:
space:
mode:
authorMartin Weinelt <hexa@darmstadt.ccc.de>2021-05-26 05:02:50 +0200
committerzowoq <59103226+zowoq@users.noreply.github.com>2021-05-26 14:19:15 +1000
commit4f6b97f2ac8c41a45b2672af6aac9dc48ec75f25 (patch)
tree2d769c80b62549bc16591e68e2c94126fb8a609b /.github
parentbb27725ca60c574c2784ee8d7a1be0208ba0ece0 (diff)
downloadnixpkgs-4f6b97f2ac8c41a45b2672af6aac9dc48ec75f25.tar
nixpkgs-4f6b97f2ac8c41a45b2672af6aac9dc48ec75f25.tar.gz
nixpkgs-4f6b97f2ac8c41a45b2672af6aac9dc48ec75f25.tar.bz2
nixpkgs-4f6b97f2ac8c41a45b2672af6aac9dc48ec75f25.tar.lz
nixpkgs-4f6b97f2ac8c41a45b2672af6aac9dc48ec75f25.tar.xz
nixpkgs-4f6b97f2ac8c41a45b2672af6aac9dc48ec75f25.tar.zst
nixpkgs-4f6b97f2ac8c41a45b2672af6aac9dc48ec75f25.zip
.github/workflows/rebase.yml: update for 21.05
Adds three more valid branches to the rebase action.
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/rebase.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml
index 50d066dd754..47e8f4e4e42 100644
--- a/.github/workflows/rebase.yml
+++ b/.github/workflows/rebase.yml
@@ -41,7 +41,7 @@ jobs:
       - name: check branch
         env:
           PERMANENT_BRANCHES: "haskell-updates|master|nixos|nixpkgs|python-unstable|release|staging"
-          VALID_BRANCHES: "haskell-updates|master|python-unstable|release-20.09|staging|staging-20.09|staging-next"
+          VALID_BRANCHES: "haskell-updates|master|python-unstable|release-20.09|release-21.05|staging|staging-20.09|staging-21.05|staging-next|staging-next-21.05"
         run: |
           message() {
             cat <<EOF