summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjak1 <mike.wollmann@gmail.com>2021-03-07 02:46:20 +0000
committerjak1 <mike.wollmann@gmail.com>2021-03-07 02:46:20 +0000
commit54b88d05bbbe616c05814d57cc4f86de649ce98c (patch)
tree05110f58404b679ab05c7bda743ef790eba1feba
parent642df3995a5caf6d78f05102361d447328116bcc (diff)
parent513f1b98ccd9c108a1d15d4177372f1a7c58059a (diff)
downloadmv-54b88d05bbbe616c05814d57cc4f86de649ce98c.tar.gz
mv-54b88d05bbbe616c05814d57cc4f86de649ce98c.tar.bz2
mv-54b88d05bbbe616c05814d57cc4f86de649ce98c.tar.xz
mv-54b88d05bbbe616c05814d57cc4f86de649ce98c.zip
Merge branch 'jak1/ci_test' into 'master'
fixed ci problems, unstable to stable(current:buster)\ added enviroment variables to fix sdl build issues
-rw-r--r--.gitlab-ci.yml6
1 files changed, 5 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bc028da5f..e9b3039f9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,7 +66,7 @@ gcc-8-i386:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/gcc8.sh
- ./tools/ci/scripts/runtests.sh
- image: i386/debian:unstable
+ image: i386/debian:buster
<<: *job-push
variables:
PACKAGES: gcc-8 g++-8
@@ -80,6 +80,8 @@ gcc-8-i386:
gcc-snapshot_sdl2:
stage: prebuild
script:
+ - export PATH="/usr/lib/gcc-snapshot/bin:/usr/lib/gcc-snapshot/lib:$PATH"
+ - export LD_LIBRARY_PATH="/usr/lib/gcc-snapshot/lib:$LD_LIBRARY_PATH"
- ./tools/ci/jobs/gccsnapshot_sdl2.sh
- ./tools/ci/scripts/runtests.sh
<<: *job-push
@@ -150,6 +152,7 @@ gcc-8:
- ./tools/ci/jobs/gcc8.sh
- ./tools/ci/scripts/runtests.sh
- ./tools/ci/scripts/rundyecmd.sh
+ image: debian:buster
<<: *job-push
variables:
PACKAGES: gcc-8 g++-8
@@ -276,6 +279,7 @@ gcc-8_unittestsbin:
script:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin --without-manaplusgame --without-dyecmd
+ image: debian:buster
<<: *job-push
variables:
PACKAGES: gcc-8 g++-8