ci: xtrace qubesbuilder up-to-date check

ben-grande · Jun 22, 2024 · 2139789 · 2139789
1 parent a6194e0
commit 2139789
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -45,8 +45,9 @@ jobs:
         with:
           fetch-depth: 0
       - uses: actions/setup-python@v5
+      - name: Test if .qubesbuilder is up-to-date
+        run: sh -x ./scripts/qubesbuilder-gen.sh test
       - uses: pre-commit/action@v3.0.1
-
       - name: Lint commits
         # yamllint disable-line rule:line-length
         run: |

diff --git a/scripts/qubesbuilder-gen.sh b/scripts/qubesbuilder-gen.sh
@@ -15,7 +15,7 @@ intended_target="${target}"
 if test "${1-}" = "test"; then
   tmpdir="$(mktemp -d)"
   target="${tmpdir}/.qubesbuilder"
-  trap 'rm -rf -- "${tmpdir}"' EXIT INT HUP QUIT ABRT
+  trap 'ec="$?"; rm -rf -- "${tmpdir}"; exit "$ec"' EXIT INT HUP QUIT ABRT
 fi
 ignored="$(git ls-files --exclude-standard --others --ignored salt/)"
 untracked="$(git ls-files --exclude-standard --others salt/)"