diff options
| author | jak1 <jak1@themanaworld.org> | 2023-04-03 00:59:43 +0200 |
|---|---|---|
| committer | jak1 <jak1@themanaworld.org> | 2023-04-03 00:59:43 +0200 |
| commit | 386a47710b235051eedf254f56b01972096aac7e (patch) | |
| tree | e50382c53b560820908d7d6ede9298aaa9b2f686 | |
| parent | ba86f9667c61670cb0fa90c10dd079ceddd24306 (diff) | |
| download | manaverse-386a47710b235051eedf254f56b01972096aac7e.tar.gz manaverse-386a47710b235051eedf254f56b01972096aac7e.tar.bz2 manaverse-386a47710b235051eedf254f56b01972096aac7e.tar.xz manaverse-386a47710b235051eedf254f56b01972096aac7e.zip | |
CI: fixed some apt issues (some vars are usable, some are not TF dont deprecate working stuff <_<)
| -rw-r--r-- | .gitignore | 5 | ||||
| -rwxr-xr-x | tools/ci/scripts/dockerretry.sh | 2 | ||||
| -rwxr-xr-x | tools/ci/scripts/updaterepos.sh | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 8261596c7..bf274d538 100644 --- a/.gitignore +++ b/.gitignore @@ -176,4 +176,7 @@ src/resources/image/image.h.gch # linters mplint -cpplint.py
\ No newline at end of file +cpplint.py + +# local gitlab-ci +.gitlab-ci-local/ diff --git a/tools/ci/scripts/dockerretry.sh b/tools/ci/scripts/dockerretry.sh index 121878cbb..ed8dbdc80 100755 --- a/tools/ci/scripts/dockerretry.sh +++ b/tools/ci/scripts/dockerretry.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # skip if we not in docker -if [[ ${CI_RUNNER_TAGS} != *"docker"* ]]; then +if [[ "$RUNFROMSHELL" != "" ]]; then echo "Running from shell. Skipping $*" exit 0 fi diff --git a/tools/ci/scripts/updaterepos.sh b/tools/ci/scripts/updaterepos.sh index f0698fc19..167898a83 100755 --- a/tools/ci/scripts/updaterepos.sh +++ b/tools/ci/scripts/updaterepos.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -if [[ ${CI_RUNNER_TAGS} != *"docker"* ]]; then +if [[ "$RUNFROMSHELL" != "" ]]; then echo "Running from shell. Skipping update repos" exit 0 fi |