Use for cycle to clear exestack

canonical · Apr 26, 2024 · 680722f · 680722f
1 parent ea766f4
commit 680722f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/core24-builds.yml b/.github/workflows/core24-builds.yml
@@ -19,7 +19,7 @@ jobs:
             tag: X64
     runs-on:
       group: "Canonical self-hosted runners"
-      lables:
+      labels:
         - self-hosted
         - linux
         - jammy

diff --git a/checkbox-core-snap/series24/snap/snapcraft.yaml b/checkbox-core-snap/series24/snap/snapcraft.yaml
@@ -222,12 +222,15 @@ parts:
       python3 manage.py build
       python3 manage.py install --layout=relocatable --prefix=/providers/checkbox-provider-base --root="$CRAFT_PART_INSTALL"
     override-prime: |
-      craftctl default
       # needed because else this will trigger the store autoreviewer and be autorejected
       # cleaning this bit should not cause any issue but if it does do not only remove this line
       # contact also the store/update the package because else this will always trigger
       # a manual review
-      [ -f usr/lib/x86_64-linux-gnu/libamdhip64.so.5* ] && execstack --clear-execstack usr/lib/x86_64-linux-gnu/libamdhip64.so.5* || true
+      export LIBAMDHIP64=$(find usr/lib -name "libamdhip64.so.5*")
+      for libamd_path in $LIBAMDHIP64; do
+        execstack --clear-execstack "$libamd_path"
+      done
+      craftctl default
     stage-packages:
       - execstack # needed to clear the execstack
       - python3-opencv