From f665e40ce936bfd32fe928df5e9c9e6a2fa0590b Mon Sep 17 00:00:00 2001 From: jak1 Date: Wed, 3 Mar 2021 04:11:25 +0100 Subject: changed build env. to buster for gcc8* --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bc028da5f..c45c90124 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 @@ -150,6 +150,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 +277,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 -- cgit v1.2.3-60-g2f50 From 513f1b98ccd9c108a1d15d4177372f1a7c58059a Mon Sep 17 00:00:00 2001 From: jak1 Date: Wed, 3 Mar 2021 04:13:41 +0100 Subject: added env. variable PATH & LD_LIBRARY_PATH to gcc-snapshot_sdl2 build --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c45c90124..e9b3039f9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 -- cgit v1.2.3-60-g2f50