From af506ac53ca3308a1d77d040c429c2b51e3147b0 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 30 May 2020 03:49:50 +0300
Subject: Replace cosmic image to xenial in ci scripts
---
.gitlab-ci.yml | 8 +++----
tools/ci/branches/ci_gcc5/.gitlab-ci.yml | 38 ++++++++++++++++----------------
tools/ci/branches/ci_h/.gitlab-ci.yml | 12 +++++-----
tools/ci/scripts/circleci/gcc5.sh | 8 +++----
4 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e9582727a..8799c996c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,7 +49,7 @@ gcc-5_c++11_i386:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/gcc5_c++11.sh
- ./tools/ci/scripts/runtests.sh
- image: i386/ubuntu:cosmic
+ image: i386/ubuntu:xenial
<<: *job-push
variables:
PACKAGES: gcc-5 g++-5
@@ -216,7 +216,7 @@ gcc-5_sdl2:
- ./tools/ci/jobs/gcc5_sdl2_c++11.sh
- ./tools/ci/scripts/runtests.sh
<<: *job-push
- image: ubuntu:cosmic
+ image: ubuntu:xenial
variables:
PACKAGES: gcc-5 g++-5
make autoconf automake autopoint gettext
@@ -295,7 +295,7 @@ gcc-5_h_all:
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -I/usr/include/SDL
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL
<<: *job-push
- image: ubuntu:cosmic
+ image: ubuntu:xenial
variables:
PACKAGES: gcc-5 g++-5
make autoconf automake autopoint gettext
@@ -311,7 +311,7 @@ gcc-5_h_all_i386:
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -I/usr/include/SDL
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -I/usr/include/SDL
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL
- image: i386/ubuntu:cosmic
+ image: i386/ubuntu:xenial
<<: *job-push
variables:
PACKAGES: gcc-5 g++-5
diff --git a/tools/ci/branches/ci_gcc5/.gitlab-ci.yml b/tools/ci/branches/ci_gcc5/.gitlab-ci.yml
index a7fc0c0f7..63c86ffa1 100644
--- a/tools/ci/branches/ci_gcc5/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc5/.gitlab-ci.yml
@@ -22,7 +22,7 @@ gcc-5_c++11_i386:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/gcc5_c++11.sh
- ./tools/ci/scripts/runtests.sh
- image: i386/ubuntu:cosmic
+ image: i386/ubuntu:xenial
<<: *job-push
variables:
PACKAGES: gcc-5 g++-5
@@ -40,7 +40,7 @@ gcc-5_sdl2:
- ./tools/ci/scripts/runtests.sh
- ./tools/ci/jobs/gcc5_sdl2_c++11.sh
- ./tools/ci/scripts/runtests.sh
- image: ubuntu:cosmic
+ image: ubuntu:xenial
<<: *job-push
variables:
PACKAGES: gcc-5 g++-5
@@ -55,7 +55,7 @@ gcc-5_sanitize_tests:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/gcc5_sanitize_tests.sh
- ldd ./src/manaplustests | grep "libasan"
- image: ubuntu:cosmic
+ image: ubuntu:xenial
<<: *job-push
variables:
PACKAGES: gcc-5 g++-5
@@ -73,7 +73,7 @@ gcc-5_sanitize_tests:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/gcc5_sanitize_tests.sh --without-dyecmd --without-manaplusgame
- ldd ./src/manaplustests | grep "libasan"
- image: i386/ubuntu:cosmic
+ image: i386/ubuntu:xenial
<<: *job-push
variables:
PACKAGES: gcc-5 g++-5
@@ -90,7 +90,7 @@ gcc-5_sanitize_no_opengl_tests:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/gcc5_sanitize_tests.sh --without-opengl --without-dyecmd --without-manaplusgame
- ldd ./src/manaplustests | grep "libasan"
- image: ubuntu:cosmic
+ image: ubuntu:xenial
<<: *job-push
variables:
PACKAGES: gcc-5 g++-5
@@ -108,7 +108,7 @@ gcc-5_sanitize_no_opengl_tests:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/gcc5_sanitize_tests.sh --without-opengl --without-dyecmd --without-manaplusgame
- ldd ./src/manaplustests | grep "libasan"
- image: i386/ubuntu:cosmic
+ image: i386/ubuntu:xenial
<<: *job-push
variables:
PACKAGES: gcc-5 g++-5
@@ -125,7 +125,7 @@ gcc-5_sanitize:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/gcc5_sanitize.sh
- ./tools/ci/scripts/runtests.sh
- image: ubuntu:cosmic
+ image: ubuntu:xenial
<<: *job-push
variables:
PACKAGES: gcc-5 g++-5
@@ -143,7 +143,7 @@ gcc-5_sanitize:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/gcc5_sanitize.sh
- ./tools/ci/scripts/runtests.sh
- image: i386/ubuntu:cosmic
+ image: i386/ubuntu:xenial
<<: *job-push
variables:
PACKAGES: gcc-5 g++-5
@@ -159,7 +159,7 @@ gcc-5_tests:
script:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/gcc5_tests.sh --without-dyecmd
- image: ubuntu:cosmic
+ image: ubuntu:xenial
<<: *job-push
variables:
PACKAGES: gcc-5 g++-5
@@ -175,7 +175,7 @@ gcc-5_tests_i386:
script:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/gcc5_tests.sh --without-dyecmd --without-manaplusgame
- image: i386/ubuntu:cosmic
+ image: i386/ubuntu:xenial
<<: *job-push
variables:
PACKAGES: gcc-5 g++-5
@@ -191,7 +191,7 @@ gcc-5_sdl2_tests:
script:
- ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-manaplusgame --enable-glibcdebug
- ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-manaplusgame --enable-stldebug
- image: ubuntu:cosmic
+ image: ubuntu:xenial
<<: *job-push
variables:
PACKAGES: gcc-5 g++-5
@@ -206,7 +206,7 @@ gcc-5_sdl2_tests_i386:
stage: build
script:
- ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-dyecmd --without-manaplusgame
- image: i386/ubuntu:cosmic
+ image: i386/ubuntu:xenial
<<: *job-push
variables:
PACKAGES: gcc-5 g++-5
@@ -221,7 +221,7 @@ gcc-5_sdl2_no_opengl_tests:
stage: build
script:
- ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-opengl --without-dyecmd --without-manaplusgame
- image: ubuntu:cosmic
+ image: ubuntu:xenial
<<: *job-push
variables:
PACKAGES: gcc-5 g++-5
@@ -236,7 +236,7 @@ gcc-5_sdl2_no_opengl_tests_i386:
stage: build
script:
- ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-opengl --without-dyecmd --without-manaplusgame
- image: i386/ubuntu:cosmic
+ image: i386/ubuntu:xenial
<<: *job-push
variables:
PACKAGES: gcc-5 g++-5
@@ -255,7 +255,7 @@ gcc-5:
- ./tools/ci/scripts/runtests.sh
- ./tools/ci/jobs/gcc5_c++11.sh
- ./tools/ci/scripts/runtests.sh
- image: ubuntu:cosmic
+ image: ubuntu:xenial
<<: *job-push
variables:
PACKAGES: gcc-5 g++-5
@@ -269,7 +269,7 @@ gcc-5_sdl2_c++11_i386:
script:
- ./tools/ci/jobs/gcc5_sdl2_c++11.sh
- ./tools/ci/scripts/runtests.sh
- image: i386/ubuntu:cosmic
+ image: i386/ubuntu:xenial
<<: *job-push
variables:
PACKAGES: gcc-5 g++-5
@@ -286,7 +286,7 @@ gcc-5_default:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/any_compiler.sh --enable-werror
- ./tools/ci/scripts/runtests.sh
- image: ubuntu:cosmic
+ image: ubuntu:xenial
<<: *job-push
variables:
LOGFILE: gcc5.log
@@ -306,7 +306,7 @@ gcc-5_default_i386:
- ./tools/ci/jobs/any_compiler.sh --enable-werror
- ./tools/ci/scripts/runtests.sh
<<: *job-push
- image: i386/ubuntu:cosmic
+ image: i386/ubuntu:xenial
variables:
LOGFILE: gcc5.log
CC: gcc-5
@@ -325,7 +325,7 @@ gcc-5_tarball:
script:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/gcc5_tarball.sh
- image: ubuntu:cosmic
+ image: ubuntu:xenial
<<: *job-push
variables:
PACKAGES: gcc-5 g++-5
diff --git a/tools/ci/branches/ci_h/.gitlab-ci.yml b/tools/ci/branches/ci_h/.gitlab-ci.yml
index 6ea46eb81..87eb88666 100644
--- a/tools/ci/branches/ci_h/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_h/.gitlab-ci.yml
@@ -24,7 +24,7 @@ gcc-5_h_all:
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -I/usr/include/SDL
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL
<<: *job-push
- image: ubuntu:cosmic
+ image: ubuntu:xenial
variables:
PACKAGES: gcc-5 g++-5
make autoconf automake autopoint gettext
@@ -41,7 +41,7 @@ gcc-5_h_all_i386:
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -I/usr/include/SDL
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -I/usr/include/SDL
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL
- image: i386/ubuntu:cosmic
+ image: i386/ubuntu:xenial
<<: *job-push
variables:
PACKAGES: gcc-5 g++-5
@@ -61,7 +61,7 @@ gcc-5_h_pugi_all:
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_PUGIXML -I/usr/include/SDL
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_PUGIXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -I/usr/include/SDL
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_PUGIXML -I/usr/include/SDL
- image: ubuntu:cosmic
+ image: ubuntu:xenial
<<: *job-push
variables:
PACKAGES: gcc-5 g++-5
@@ -79,7 +79,7 @@ gcc-5_h_tinyxml2_all:
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_TINYXML2 -I/usr/include/SDL
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_TINYXML2 -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -I/usr/include/SDL
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_TINYXML2 -I/usr/include/SDL
- image: ubuntu:cosmic
+ image: ubuntu:xenial
<<: *job-push
variables:
PACKAGES: gcc-5 g++-5
@@ -95,7 +95,7 @@ gcc-5_h_sdl2:
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -DUSE_SDL2 -I/usr/include/SDL2
- image: ubuntu:cosmic
+ image: ubuntu:xenial
<<: *job-push
variables:
PACKAGES: gcc-5 g++-5
@@ -111,7 +111,7 @@ gcc-5_h_sdl2_i386:
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -DUSE_SDL2 -I/usr/include/SDL2
- image: i386/ubuntu:cosmic
+ image: i386/ubuntu:xenial
<<: *job-push
variables:
PACKAGES: gcc-5 g++-5
diff --git a/tools/ci/scripts/circleci/gcc5.sh b/tools/ci/scripts/circleci/gcc5.sh
index 41b78f0bb..42a7caaa4 100755
--- a/tools/ci/scripts/circleci/gcc5.sh
+++ b/tools/ci/scripts/circleci/gcc5.sh
@@ -5,25 +5,25 @@ echo "Current node: ${CIRCLE_NODE_INDEX}"
case $CIRCLE_NODE_INDEX in
0)
- export IMAGE=ubuntu:cosmic
+ export IMAGE=ubuntu:xenial
export COMMAND="./tools/ci/jobs/gcc5.sh --enable-werror --without-opengl"
export PACKAGES="gcc-5 g++-5 ${LIBS_PACKAGES} ${SDL1}"
./tools/ci/scripts/docker_run.sh
;;
1)
- export IMAGE=i386/ubuntu:cosmic
+ export IMAGE=i386/ubuntu:xenial
export COMMAND="./tools/ci/jobs/gcc5.sh --enable-werror --without-opengl"
export PACKAGES="gcc-5 g++-5 ${LIBS_PACKAGES} ${SDL1}"
./tools/ci/scripts/docker_run.sh
;;
2)
- export IMAGE=ubuntu:cosmic
+ export IMAGE=ubuntu:xenial
export COMMAND="./tools/ci/jobs/gcc5.sh --enable-werror --without-opengl --with-sdl2"
export PACKAGES="gcc-5 g++-5 ${LIBS_PACKAGES} ${SDL2}"
./tools/ci/scripts/docker_run.sh
;;
3)
- export IMAGE=i386/ubuntu:cosmic
+ export IMAGE=i386/ubuntu:xenial
export COMMAND="./tools/ci/jobs/gcc5.sh --enable-werror --without-opengl --with-sdl2"
export PACKAGES="gcc-5 g++-5 ${LIBS_PACKAGES} ${SDL2}"
./tools/ci/scripts/docker_run.sh
--
cgit v1.2.3-70-g09d2