Merge pull request #70 from MirServer/skip-noble-usns

snaps: skip usns for `base: core24` snaps
canonical · Feb 6, 2024 · f853fcd · f853fcd
2 parents ffd74db + 950e5a8
commit f853fcd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/snaps.yml b/.github/workflows/snaps.yml
@@ -1,7 +1,7 @@
 name: Snaps
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.number && format('pr{0}', github.event.number) || github.ref_name }}
   cancel-in-progress: true
 
 on:
@@ -10,6 +10,11 @@ on:
   workflow_dispatch:
   schedule:
   - cron: '0 * * * *'
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+    paths:
+    - .github/workflows/snaps.yml
+    - bin/process_snaps.py
 
 jobs:
   ProcessSnaps:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,14 +1,17 @@
 name: Test
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.number && format('pr{0}', github.event.number) || github.ref_name }}
   cancel-in-progress: true
 
 on:
   merge_group:
     types: [checks_requested]
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
+    paths:
+    - .github/workflows/test*yml
+    - mir-ci/**
 
 jobs:
   RunTests:

diff --git a/bin/process_snaps.py b/bin/process_snaps.py
@@ -36,7 +36,7 @@
     "graphics-test-tools": {
         "20/beta": {"recipe": "graphics-test-tools-20-beta"},
         "22/beta": {"recipe": "graphics-test-tools-22-beta"},
-        "24/edge": {"recipe": "graphics-test-tools-24-edge"},
+        "24/edge": {"recipe": "graphics-test-tools-24-edge", "check-usns": False},
     },
     "mir-kiosk": {
         "edge": {"ppa": "dev", "recipe": "mir-kiosk-edge", "release": "focal"},
@@ -56,7 +56,7 @@
         "20/beta": {"ppa": "rc", "recipe": "mir-test-tools-20-beta", "release": "focal"},
         "22/edge": {"ppa": "dev", "recipe": "mir-test-tools-22-edge"},
         "22/beta": {"ppa": "rc", "recipe": "mir-test-tools-22-beta"},
-        "24/edge": {"ppa": "dev", "recipe": "mir-test-tools-24-edge", "release": "noble"},
+        "24/edge": {"ppa": "dev", "recipe": "mir-test-tools-24-edge", "release": "noble", "check-usns": False},
     },
     "miriway": {
         "edge": {"ppa": "dev", "recipe": "miriway-edge"},
@@ -85,7 +85,7 @@
         "beta": {"recipe": "mesa-core22-beta"},
     },
     "mesa-core24": {
-        "edge": {"recipe": "mesa-core24-edge"},
+        "edge": {"recipe": "mesa-core24-edge", "check-usns": False},
     },
     "nvidia-core22": {
         "beta": {"recipe": "nvidia-core22-beta"},
@@ -307,7 +307,7 @@ def getSeries(name):
                    or mir_version == SNAP_VERSION_RE.match(store_snap["version"]).group("mir")
                    for store_snap in store_snaps):
 
-                if check_notices:
+                if snap_map.get("check-usns", True) and check_notices:
                     snap_notices = check_snap_notices(store_snaps)[snap]
 
                     if any(snap_notices.values()):