From c81e1a8e73c17f14b3aee483aad4cdbdfbc3ac74 Mon Sep 17 00:00:00 2001
From: Mathieu Hofman <86499+mhofman@users.noreply.github.com>
Date: Fri, 26 Jan 2024 11:03:04 -0800
Subject: [PATCH] ci: add `dev-` branches as supported PR target (#8828)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
---
 .github/workflows/after-merge.yml           | 5 +++++
 .github/workflows/ag-solo-xs.yml.DISABLED   | 1 +
 .github/workflows/docker.yml                | 5 +++++
 .github/workflows/golangci-lint.yml         | 1 +
 .github/workflows/integration.yml           | 1 +
 .github/workflows/pre-check-integration.yml | 2 ++
 6 files changed, 15 insertions(+)

diff --git a/.github/workflows/after-merge.yml b/.github/workflows/after-merge.yml
index c9a3b86d6440..24910a6d7efa 100644
--- a/.github/workflows/after-merge.yml
+++ b/.github/workflows/after-merge.yml
@@ -7,6 +7,7 @@ on:
       # $default-branch
       - master
       - 'release-*'
+      - 'dev-*'
   workflow_dispatch:
 
 jobs:
@@ -60,6 +61,10 @@ jobs:
               # A pre-release.
               TAG=${GITHUB_REF_NAME#release-}-dev
               ;;
+            dev-*)
+              # A pre-release while our release branch is straying from master
+              TAG=${GITHUB_REF_NAME#dev-}-dev
+              ;;
             master)
               # A trunk dev release.
               TAG=dev
diff --git a/.github/workflows/ag-solo-xs.yml.DISABLED b/.github/workflows/ag-solo-xs.yml.DISABLED
index e832dd99453c..b164b2b8a04e 100644
--- a/.github/workflows/ag-solo-xs.yml.DISABLED
+++ b/.github/workflows/ag-solo-xs.yml.DISABLED
@@ -9,6 +9,7 @@ on:
       # $default-branch
       - master
       - 'release-*'
+      - 'dev-*'
 
 jobs:
   xs-build:
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index bdfb8ab54e85..6cfe6f84396a 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -6,6 +6,7 @@ on:
       # $default-branch
       - master
       - 'release-*'
+      - 'dev-*'
     tags:
       - '@agoric/sdk@*'
   workflow_dispatch:
@@ -147,6 +148,10 @@ jobs:
                   # A pre-release.
                   DOCKER_TAGS=${GITHUB_REF_NAME#release-}-dev
                   ;;
+                dev-*)
+                  # A pre-release while our release branch is straying from master
+                  DOCKER_TAGS=${GITHUB_REF_NAME#dev-}-dev
+                  ;;
                 master)
                   # A trunk dev release.
                   DOCKER_TAGS=dev
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index 993e5bb4f7a7..a6fcd3310e39 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -7,6 +7,7 @@ on:
       # $default-branch
       - master
       - 'release-*'
+      - 'dev-*'
   pull_request:
   merge_group:
 permissions:
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index cd3c32989138..f22eb7beefcf 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -8,6 +8,7 @@ on:
     branches:
       - master
       - 'release-*'
+      - 'dev-*'
       - beta
     tags:
       - '@agoric/sdk@*'
diff --git a/.github/workflows/pre-check-integration.yml b/.github/workflows/pre-check-integration.yml
index c8594081ff35..bafab455a405 100644
--- a/.github/workflows/pre-check-integration.yml
+++ b/.github/workflows/pre-check-integration.yml
@@ -17,6 +17,7 @@ on:
               (
                 github.event.pull_request.base.ref == 'master' ||
                 startsWith(github.event.pull_request.base.ref, 'release-') ||
+                startsWith(github.event.pull_request.base.ref, 'dev-') ||
                 github.event.pull_request.base.ref == 'beta'
               ) &&
               github.event.pull_request.draft == false &&
@@ -38,6 +39,7 @@ jobs:
         (
           github.event.pull_request.base.ref == 'master' ||
           startsWith(github.event.pull_request.base.ref, 'release-') ||
+          startsWith(github.event.pull_request.base.ref, 'dev-') ||
           github.event.pull_request.base.ref == 'beta'
         ) &&
         github.event.pull_request.draft == false &&