From 5a4727a1c158ef5eff7cb954f1f15ee0ed802ea8 Mon Sep 17 00:00:00 2001
From: Bruce Johnston <bjohnsto@redhat.com>
Date: Thu, 26 Feb 2026 10:04:20 -0500
Subject: [PATCH 1/2] dm vdo ci: rename ci.yml to ci-main.yml

Our CI uses pull_request_target because it allows for fork PRs to
access repo secrets, which we need. However, using pull_request_target
also comes with restrictions. One of those restrictions is that any
actions run on the PR will be run in the main branch's context. Even
if you have a PR targeting a different branch, it will still use
the main branch's context; meaning it will use the CI from the main
branch, not the CI file located on the branch. The plan is to have
different ci files with separate branch filters. This will allow
different actions to be run within the main branch's context.

First step is to rename the current CI file.

Signed-off-by: Bruce Johnston <bjohnsto@redhat.com>
---
 .github/workflows/{ci.yml => ci-main.yml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/workflows/{ci.yml => ci-main.yml} (100%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci-main.yml
similarity index 100%
rename from .github/workflows/ci.yml
rename to .github/workflows/ci-main.yml

From 66ff4dfeb0132a60f122b45e8849e0287b9f8a29 Mon Sep 17 00:00:00 2001
From: Bruce Johnston <bjohnsto@redhat.com>
Date: Thu, 26 Feb 2026 10:12:06 -0500
Subject: [PATCH 2/2] dm vdo ci: Separate CI for main and 8.3 branches

Create a new ci file specifically for our 8.3 branches that only runs
when any of the 8.3 branches are targeted. Update the ci-main.yml file
to only run when the main branch is targeted.

Signed-off-by: Bruce Johnston <bjohnsto@redhat.com>
---
 .github/workflows/ci-8.3.yml  | 26 ++++++++++++++++++++++++++
 .github/workflows/ci-main.yml |  3 ++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/ci-8.3.yml

diff --git a/.github/workflows/ci-8.3.yml b/.github/workflows/ci-8.3.yml
new file mode 100644
index 000000000..a5452dc72
--- /dev/null
+++ b/.github/workflows/ci-8.3.yml
@@ -0,0 +1,26 @@
+name: CI (8.3)
+
+on:
+  pull_request_target:
+    branches: [ '8.3*' ]
+    types: [ opened, reopened, ready_for_review, synchronize ]
+  workflow_dispatch:
+
+# This allows a subsequently queued workflow run to interrupt previous runs
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
+jobs:
+  Run-Common-CI:
+    uses: dm-vdo/vdo-org-actions/.github/workflows/ci.yaml@main
+    with:
+      logfile: logs-${{ github.event.repository.owner.login }}-${{ github.event.repository.name }}-${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.sha }}
+      run-public-build: false
+      run-public-tests: false
+      private-runner-distro: rhel
+      run-private-build: true
+      private-build-action: make all
+      run-private-tests: true
+      private-tests-action: make jenkins
+    secrets: inherit
diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
index 76cd7ba2b..6fc25ce64 100644
--- a/.github/workflows/ci-main.yml
+++ b/.github/workflows/ci-main.yml
@@ -1,7 +1,8 @@
-name: CI
+name: CI (main)
 
 on:
   pull_request_target:
+    branches: [ 'main' ]
     types: [ opened, reopened, ready_for_review, synchronize ]
   workflow_dispatch: