From 5916bddae226775b749efda13ecf6437ae3d3248 Mon Sep 17 00:00:00 2001 From: Lightmann Date: Mon, 29 Jul 2024 13:31:47 -0400 Subject: [PATCH 1/4] Exit on error for 'dragon' --- bin/dragon | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/dragon b/bin/dragon index 97ffb79bd..16c0ad1de 100644 --- a/bin/dragon +++ b/bin/dragon @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -e + export DRAGON_DIR=.dragon export DRAGON_VERS=$(python3 -c 'from dragon.util import version; print(version())') From 6e225c9abba537dd6a0af5ab1109a2f6e59438e2 Mon Sep 17 00:00:00 2001 From: Lightmann Date: Mon, 29 Jul 2024 13:32:54 -0400 Subject: [PATCH 2/4] Fix stty for CI --- src/dragon/shscripts/util | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/dragon/shscripts/util b/src/dragon/shscripts/util index cac9ecd0f..702992167 100644 --- a/src/dragon/shscripts/util +++ b/src/dragon/shscripts/util @@ -15,7 +15,9 @@ drexit() # This function resets terminal colors, fixes stty (just in case), and then exits with arg0's value # It should be called on *EVERY* exit, no matter what. echo -e "${NC}" - stty sane + if [[ -t 0 ]]; then + stty sane + fi python3 -m dragon.update_check exit $1 } From 5f5720b25ed8b6868ba2c4d32574987d7856637e Mon Sep 17 00:00:00 2001 From: Lightmann Date: Mon, 29 Jul 2024 13:33:06 -0400 Subject: [PATCH 3/4] Don't fail-fast for CI --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 78ff09c41..461de8d18 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,6 +16,7 @@ on: jobs: tests: strategy: + fail-fast: false matrix: project-link: - https://github.com/kritanta-ios-tweaks/Chapters From 1bf85431619b438f39679a559eddec54ed5d130b Mon Sep 17 00:00:00 2001 From: Lightmann Date: Mon, 29 Jul 2024 14:17:47 -0400 Subject: [PATCH 4/4] Fix properly --- bin/dragon | 4 +--- src/dragon/shscripts/building | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/bin/dragon b/bin/dragon index 16c0ad1de..e665a0c4e 100644 --- a/bin/dragon +++ b/bin/dragon @@ -1,7 +1,5 @@ #!/usr/bin/env bash -set -e - export DRAGON_DIR=.dragon export DRAGON_VERS=$(python3 -c 'from dragon.util import version; print(version())') @@ -217,7 +215,7 @@ if [[ $build -eq 1 ]]; then cp DragonMake "$i/$DRAGON_DIR/DragonMake" 2> /dev/null fi build $i $j - done + done || exit find . -name '.clean' -type f -delete diff --git a/src/dragon/shscripts/building b/src/dragon/shscripts/building index c0af05c15..54a37c373 100644 --- a/src/dragon/shscripts/building +++ b/src/dragon/shscripts/building @@ -1,6 +1,5 @@ #!/usr/bin/env bash - clean_dir() { DNAME=$1