ci: add downstream patch conflict checks

canonical · Jan 13, 2025 · aab2a92 · aab2a92
1 parent c29a8bf
commit aab2a92
Showing 1 changed file with 37 additions and 2 deletions.
diff --git a/.github/workflows/packaging-tests.yml b/.github/workflows/packaging-tests.yml
@@ -17,9 +17,44 @@ env:
   RELEASE: focal
 
 jobs:
-  check-patches:
-    name: Check patches
+  check-packages-conflicts-downstreams:
     runs-on: ubuntu-24.04
+    strategy:
+      matrix:
+        merge-branch: ["ubuntu/devel", "ubuntu/oracular", "ubuntu/noble", "ubuntu/jammy", "ubuntu/focal"]
+    name: Check patches (packaging branch)
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          # Fetch all branches for merging
+          fetch-depth: 0
+          ref: ${{ github.event.pull_request.head.sha }}
+      - name: Prepare dependencies
+        run: |
+          sudo DEBIAN_FRONTEND=noninteractive apt-get update
+          sudo DEBIAN_FRONTEND=noninteractive apt-get -y install tox quilt
+      - name: Setup quilt environment
+        run: |
+          echo 'QUILT_PATCHES=debian/patches' >> ~/.quiltrc
+          echo 'QUILT_SERIES=debian/patches/series' >> ~/.quiltrc
+      - name: Configure git and merge
+        run: |
+          git config user.name "GitHub Actions"
+          git config user.email "actions@github.com"
+          git merge "$${{matrix.merge-branch}}"
+      - name: Quilt patches apply successfully and tests run
+        run: |
+          if [ ! -f debian/patches/series ]; then
+            echo "no patches, skipping"
+            exit 0
+          fi
+          quilt push -a
+          tox -e py3
+          quilt pop -a
+  check-patches-packaging:
+    runs-on: ubuntu-24.04
+    name: Check patches (packaging branch)
     steps:
       - name: Checkout
         uses: actions/checkout@v4