Prepare for 8.2 branch

Signed-off-by: Mattia Verga <[email protected]> (cherry picked from commit 1fb3bc1) # Conflicts: # .mergify.yml
fedora-infra · Oct 5, 2024 · eaa4113 · eaa4113
1 parent f9113f6
commit eaa4113
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 0 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -6,11 +6,13 @@ on:
       - develop
       - 8.0
       - 8.1
+      - 8.2
   pull_request:
     branches:
       - develop
       - 8.0
       - 8.1
+      - 8.2
 
 jobs:
   analyze:

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -5,6 +5,7 @@ on:
       - develop
       - 8.0
       - 8.1
+      - 8.2
     paths:
       - docs/**
 

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -5,11 +5,13 @@ on:
       - develop
       - 8.0
       - 8.1
+      - 8.2
   pull_request:
     branches:
       - develop
       - 8.0
       - 8.1
+      - 8.2
 
 name: Run tests
 

diff --git a/.mergify.yml b/.mergify.yml
@@ -4,6 +4,7 @@ queue_rules:
     - status-success=DCO
     - status-success=Pre-commit checks
     - status-success=Diff-cover check
+<<<<<<< HEAD
     - status-success=Integration Tests (f38)
     - status-success=Unit Tests (f38, bodhi-client)
     - status-success=Unit Tests (f38, bodhi-messages)
@@ -17,6 +18,21 @@ queue_rules:
     - status-success=Unit Tests (pip, bodhi-server)
     - status-success=Build Documentation (f38)
     - status-success=Build Documentation (f39)
+=======
+    - status-success=Integration Tests (f40)
+    - status-success=Integration Tests (f41)
+    - status-success=Unit Tests (f40, bodhi-client)
+    - status-success=Unit Tests (f40, bodhi-messages)
+    - status-success=Unit Tests (f40, bodhi-server)
+    - status-success=Unit Tests (f41, bodhi-client)
+    - status-success=Unit Tests (f41, bodhi-messages)
+    - status-success=Unit Tests (f41, bodhi-server)
+    - status-success=Unit Tests (pip, bodhi-client)
+    - status-success=Unit Tests (pip, bodhi-messages)
+    - status-success=Unit Tests (pip, bodhi-server)
+    - status-success=Build Documentation (f40)
+    - status-success=Build Documentation (f41)
+>>>>>>> 1fb3bc137 (Prepare for 8.2 branch)
     - status-success=Build Documentation (pip)
 
 
@@ -35,6 +51,7 @@ pull_request_rules:
   - status-success=DCO
   - status-success=Pre-commit checks
   - status-success=Diff-cover check
+<<<<<<< HEAD
   - status-success=Integration Tests (f38)
   - status-success=Unit Tests (f38, bodhi-client)
   - status-success=Unit Tests (f38, bodhi-messages)
@@ -48,6 +65,21 @@ pull_request_rules:
   - status-success=Unit Tests (pip, bodhi-server)
   - status-success=Build Documentation (f38)
   - status-success=Build Documentation (f39)
+=======
+  - status-success=Integration Tests (f40)
+  - status-success=Integration Tests (f41)
+  - status-success=Unit Tests (f40, bodhi-client)
+  - status-success=Unit Tests (f40, bodhi-messages)
+  - status-success=Unit Tests (f40, bodhi-server)
+  - status-success=Unit Tests (f41, bodhi-client)
+  - status-success=Unit Tests (f41, bodhi-messages)
+  - status-success=Unit Tests (f41, bodhi-server)
+  - status-success=Unit Tests (pip, bodhi-client)
+  - status-success=Unit Tests (pip, bodhi-messages)
+  - status-success=Unit Tests (pip, bodhi-server)
+  - status-success=Build Documentation (f40)
+  - status-success=Build Documentation (f41)
+>>>>>>> 1fb3bc137 (Prepare for 8.2 branch)
   - status-success=Build Documentation (pip)
 
 - name: backport 8.0
@@ -69,3 +101,13 @@ pull_request_rules:
   - label!=WIP
   - -draft
   - label=8.1-backports
+
+- name: backport 8.2
+  actions:
+    backport:
+      branches:
+      - '8.2'
+  conditions:
+  - label!=WIP
+  - -draft
+  - label=8.2-backports