fixup! 3322851

canonical · Jan 13, 2025 · c5082f6 · c5082f6
1 parent 26bdee1
commit c5082f6
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/.github/workflows/packaging-tests.yml b/.github/workflows/packaging-tests.yml
@@ -2,6 +2,9 @@ name: Packaging
 
 on:
   pull_request:
+  push:
+    branches:
+      - main
 
 concurrency:
   group: 'ci-${{ github.workflow }}-${{ github.ref }}'
@@ -15,8 +18,8 @@ env:
   RELEASE: focal
 
 jobs:
-  patch-conflicts-upstream:
-    if: contains('refs/heads/main', github.ref)
+  patch-conflicts-ubuntu:
+    if: contains( ${{matrix.merge-branch}}, github.ref)
     runs-on: ubuntu-24.04
     strategy:
       matrix:
@@ -51,8 +54,8 @@ jobs:
           quilt push -a
           tox -e py3
           quilt pop -a
-  patch-conflicts-ubuntu:
-    if: contains( ${{matrix.merge-branch}}, github.ref)
+  patch-conflicts-upstream:
+    if: contains('refs/heads/main', github.ref)
     runs-on: ubuntu-24.04
     name: Check patches (packaging PR)
     steps: