summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Kuryloski <kuryloskip@vmware.com>2022-01-11 16:47:46 +0100
committerPhilip Kuryloski <kuryloskip@vmware.com>2022-01-11 16:47:46 +0100
commit06d7c3fa84f79b510b17789582d09336404032e0 (patch)
tree2012e4673cab6f376de60c946b007003b3ee5299
parent98539b9852f8ff77865ef93c0de975d343ff5b60 (diff)
downloadrabbitmq-server-git-06d7c3fa84f79b510b17789582d09336404032e0.tar.gz
GitHub Actions updates for the new v3.10.x branch
-rw-r--r--.github/mergify.yml45
-rw-r--r--.github/workflows/rabbitmq_peer_discovery_aws.yaml1
-rw-r--r--.github/workflows/test-mixed-versions.yaml1
-rw-r--r--.github/workflows/update-otp-for-oci.yaml1
-rw-r--r--.github/workflows/update-rbe-images.yaml1
5 files changed, 47 insertions, 2 deletions
diff --git a/.github/mergify.yml b/.github/mergify.yml
index a818304e74..2f66979fd2 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -13,9 +13,50 @@ pull_request_rules:
label:
add:
- make
- - name: Automatically backport to v3.9.x based on label
+ - name: Automatically backport to v3.10.x based on label
+ conditions:
+ - base=master
+ - label=backport-v3.10.x
+ - label!=backport-v3.9.x
+ - label!=backport-v3.8.x
+ actions:
+ backport:
+ branches:
+ - v3.10.x
+ assignees:
+ - "{{ author }}"
+ - name: Automatically backport to v3.10.x & v3.9.x based on labels
conditions:
- base=master
+ - label=backport-v3.10.x
+ - label=backport-v3.9.x
+ - label!=backport-v3.8.x
+ actions:
+ backport:
+ branches:
+ - v3.10.x
+ labels:
+ - backport-v3.9.x
+ assignees:
+ - "{{ author }}"
+ - name: Automatically backport to v3.10.x, v3.9.x & v3.8.x based on labels
+ conditions:
+ - base=master
+ - label=backport-v3.10.x
+ - label=backport-v3.9.x
+ - label=backport-v3.8.x
+ actions:
+ backport:
+ branches:
+ - v3.10.x
+ labels:
+ - backport-v3.9.x
+ - backport-v3.8.x
+ assignees:
+ - "{{ author }}"
+ - name: Automatically backport to v3.9.x based on label
+ conditions:
+ - base=v3.10.x
- label=backport-v3.9.x
- label!=backport-v3.8.x
actions:
@@ -26,7 +67,7 @@ pull_request_rules:
- "{{ author }}"
- name: Automatically backport to v3.9.x & v3.8.x based on labels
conditions:
- - base=master
+ - base=v3.10.x
- label=backport-v3.9.x
- label=backport-v3.8.x
actions:
diff --git a/.github/workflows/rabbitmq_peer_discovery_aws.yaml b/.github/workflows/rabbitmq_peer_discovery_aws.yaml
index 6446ca3dff..fbd705cb5c 100644
--- a/.github/workflows/rabbitmq_peer_discovery_aws.yaml
+++ b/.github/workflows/rabbitmq_peer_discovery_aws.yaml
@@ -3,6 +3,7 @@ on:
push:
branches:
- master
+ - v3.10.x
- v3.9.x
- v3.8.x
paths:
diff --git a/.github/workflows/test-mixed-versions.yaml b/.github/workflows/test-mixed-versions.yaml
index e14abfee58..33ef0a9530 100644
--- a/.github/workflows/test-mixed-versions.yaml
+++ b/.github/workflows/test-mixed-versions.yaml
@@ -3,6 +3,7 @@ on:
push:
branches:
- master
+ - v3.10.x
- v3.9.x
- v3.8.x
- bump-rbe-image-*
diff --git a/.github/workflows/update-otp-for-oci.yaml b/.github/workflows/update-otp-for-oci.yaml
index d7acd89cd4..38c4788a6c 100644
--- a/.github/workflows/update-otp-for-oci.yaml
+++ b/.github/workflows/update-otp-for-oci.yaml
@@ -61,6 +61,7 @@ jobs:
commit-message: |
Adopt otp ${{ steps.fetch-version.outputs.VERSION }} for OCI workflow
labels: |
+ backport-v3.10.x
backport-v3.9.x
backport-v3.8.x
branch: bump-otp-for-oci
diff --git a/.github/workflows/update-rbe-images.yaml b/.github/workflows/update-rbe-images.yaml
index a988b66a2f..96569364c1 100644
--- a/.github/workflows/update-rbe-images.yaml
+++ b/.github/workflows/update-rbe-images.yaml
@@ -54,6 +54,7 @@ jobs:
for remote build execution (RBE) with BuildBuddy
labels: |
+ backport-v3.10.x
backport-v3.9.x
backport-v3.8.x
branch: bump-rbe-${{ matrix.short_version }}