feat(github_actions): Improve readability
Signed-off-by: Lucas Schwiderski <lucas@lschwiderski.de>
This commit is contained in:
parent
e7239840f4
commit
857b7199d6
|
@ -93,6 +93,7 @@ $LAST_COMMIT_MSG
|
|||
|
||||
Commits: https://github.com/awesomeWM/awesome/compare/${GITHUB_BASE_REF}..${GITHUB_HEAD_REF}
|
||||
Build URL: $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID"
|
||||
|
||||
git commit -m "[relevant] $COMMIT_MSG"
|
||||
|
||||
# Commit the irrelevant changes.
|
||||
|
|
|
@ -360,9 +360,8 @@ jobs:
|
|||
echo "Testing commit $commit"
|
||||
|
||||
# Some files are updated when compiling...
|
||||
git reset --hard
|
||||
git checkout --force "$commit"
|
||||
git --no-pager show --stat --oneline
|
||||
git show --stat --oneline
|
||||
|
||||
cmake -S ${{ github.workspace }} -B "${{ github.workspace}}/build" \
|
||||
-DAWESOME_VERSION=$AWESOME_VERSION \
|
||||
|
@ -381,7 +380,7 @@ jobs:
|
|||
fi
|
||||
done
|
||||
|
||||
git checkout -qf ${{ github.head_ref }}
|
||||
git checkout --quiet --force ${{ github.head_ref }}
|
||||
if [ -n "$failed" ]; then
|
||||
echo "Checks failed for these commits:"
|
||||
|
||||
|
|
11
tests/run.sh
11
tests/run.sh
|
@ -185,18 +185,11 @@ start_awesome() {
|
|||
cd "$build_dir"
|
||||
|
||||
# On some systems clients from a test may still linger for a while until they
|
||||
# are fully killed. Since this can affect susequent tests, we wait until all
|
||||
# are fully killed. Since this can affect subsequent tests, we wait until all
|
||||
# of them are gone.
|
||||
# The check command needs to call `xlsclients` twice:
|
||||
# 1. Test the stdout of `xlsclients` and make sure there are no clients left.
|
||||
# 2. Check and fail if `xlsclients` itself fails. Print its stderr, if any.
|
||||
# This is due to the fact that, if `xlsclient` return non-0, the `wc` would
|
||||
# still report `0`. The order of commands makes sure that `xlsclient` is only
|
||||
# called twice when needed. If there are still clients left, the `[` will
|
||||
# shotcurcuit.
|
||||
wait_until_success \
|
||||
'wait for X clients from previous test to close' \
|
||||
"[ \$(DISPLAY="$D" xlsclients | wc -l) -eq 0 ] && DISPLAY="$D" xlsclients > /dev/null"
|
||||
"[ -z \"\$(DISPLAY=\"$D\" xlsclients 2>/dev/null)\" ]"
|
||||
|
||||
# Kill awesome after $TEST_TIMEOUT seconds (e.g. for errors during test setup).
|
||||
# SOURCE_DIRECTORY is used by .luacov.
|
||||
|
|
Loading…
Reference in New Issue