diff options
| author | QMK Bot <hello@qmk.fm> | 2023-03-29 05:49:39 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2023-03-29 05:49:39 +0000 |
| commit | d95a8c79316e41c9afc90cbe5a685577d0fe55ed (patch) | |
| tree | 841c90ac2af8db4932f996c1f2589ddb00e873c7 | |
| parent | 9602938e9ef7b4c4a8c19b29dadde7423daff1f5 (diff) | |
| parent | d31d1488e8e72a7e8542edd36f335c7d146b1f97 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | .github/workflows/ci_builds.yml | 8 | ||||
| -rwxr-xr-x | util/ci/generate_failure_markdown.sh | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/.github/workflows/ci_builds.yml b/.github/workflows/ci_builds.yml index ef792dcbaf..b5e5bcb4fd 100644 --- a/.github/workflows/ci_builds.yml +++ b/.github/workflows/ci_builds.yml @@ -39,11 +39,13 @@ jobs: - name: Run `qmk mass-compile` (keymap ${{ matrix.keymap }}) run: | export NCPUS=$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null) - qmk mass-compile -t -j $NCPUS -km ${{ matrix.keymap }} -e DUMP_CI_METADATA=yes + qmk mass-compile -t -j $NCPUS -km ${{ matrix.keymap }} -e DUMP_CI_METADATA=yes || touch .failed # Generate the step summary markdown - ./util/ci/generate_failure_markdown.sh > $GITHUB_STEP_SUMMARY + ./util/ci/generate_failure_markdown.sh > $GITHUB_STEP_SUMMARY || true # Truncate to a maximum of 1MB to deal with GitHub workflow limit - truncate --size='<960K' $GITHUB_STEP_SUMMARY + truncate --size='<960K' $GITHUB_STEP_SUMMARY || true + # Exit with failure if the compilation stage failed + [ ! -f .failed ] || exit 1 - name: 'Upload artifacts' uses: actions/upload-artifact@v3 diff --git a/util/ci/generate_failure_markdown.sh b/util/ci/generate_failure_markdown.sh index 5f21f06856..ccb3eacb35 100755 --- a/util/ci/generate_failure_markdown.sh +++ b/util/ci/generate_failure_markdown.sh @@ -19,3 +19,5 @@ dump_failure_info() { for failure_file in $(find "$qmk_firmware_dir/.build" -name 'failed.log.*' | sort); do dump_failure_info "$failure_file" done + +exit 0 |