From 2139789432960d74b5f34d54669ae1c4fa6bc86f Mon Sep 17 00:00:00 2001 From: Ben Grande Date: Sat, 22 Jun 2024 12:23:46 +0200 Subject: [PATCH] ci: xtrace qubesbuilder up-to-date check --- .github/workflows/main.yaml | 3 ++- scripts/qubesbuilder-gen.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 822af66..bcd7fff 100644 --- 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 index fd4b60e..8cec170 100755 --- 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/)"