From 92f44bbb86c6a924caeaf5d391a560da2a9010c8 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 30 May 2020 03:30:46 +0300 Subject: Update image names in circleci scripts --- tools/ci/scripts/circleci/gcc7.sh | 8 ++++---- tools/ci/scripts/circleci/gcc7_sanitize_tests.sh | 4 ++-- tools/ci/scripts/circleci/gcc7_tests.sh | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/ci/scripts/circleci/gcc7.sh b/tools/ci/scripts/circleci/gcc7.sh index 6a2ccd6a6..a56f8bb42 100755 --- a/tools/ci/scripts/circleci/gcc7.sh +++ b/tools/ci/scripts/circleci/gcc7.sh @@ -5,25 +5,25 @@ echo "Current node: ${CIRCLE_NODE_INDEX}" case $CIRCLE_NODE_INDEX in 0) - export IMAGE=debian:unstable + export IMAGE=debian:buster export COMMAND="./tools/ci/jobs/gcc7.sh --enable-werror --without-opengl" export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL1}" ./tools/ci/scripts/docker_run.sh ;; 1) - export IMAGE=vicamo/debian:sid-i386 + export IMAGE=i386/debian:buster export COMMAND="./tools/ci/jobs/gcc7.sh --enable-werror --without-opengl" export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL1}" ./tools/ci/scripts/docker_run.sh ;; 2) - export IMAGE=debian:unstable + export IMAGE=debian:buster export COMMAND="./tools/ci/jobs/gcc7.sh --enable-werror --without-opengl --with-sdl2" export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL2}" ./tools/ci/scripts/docker_run.sh ;; 3) - export IMAGE=vicamo/debian:sid-i386 + export IMAGE=i386/debian:buster export COMMAND="./tools/ci/jobs/gcc7.sh --enable-werror --without-opengl --with-sdl2" export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL2}" ./tools/ci/scripts/docker_run.sh diff --git a/tools/ci/scripts/circleci/gcc7_sanitize_tests.sh b/tools/ci/scripts/circleci/gcc7_sanitize_tests.sh index 10579b1a3..4757fb0b1 100755 --- a/tools/ci/scripts/circleci/gcc7_sanitize_tests.sh +++ b/tools/ci/scripts/circleci/gcc7_sanitize_tests.sh @@ -8,7 +8,7 @@ case $CIRCLE_NODE_INDEX in echo nothing ;; 1) - export IMAGE=debian:unstable + export IMAGE=debian:buster export COMMAND="./tools/ci/jobs/gcc7_sanitize_tests.sh --enable-unittests=yes --without-dyecmd --without-manaplusgame --without-opengl" export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL1} valgrind" ./tools/ci/scripts/docker_run.sh @@ -17,7 +17,7 @@ case $CIRCLE_NODE_INDEX in echo nothing ;; 3) - export IMAGE=debian:unstable + export IMAGE=debian:buster export COMMAND="./tools/ci/jobs/gcc7_sanitize_tests.sh --enable-unittests=yes --without-dyecmd --without-manaplusgame --without-opengl --with-sdl2" export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL2} valgrind" ./tools/ci/scripts/docker_run.sh diff --git a/tools/ci/scripts/circleci/gcc7_tests.sh b/tools/ci/scripts/circleci/gcc7_tests.sh index 4c604159d..8679f366c 100755 --- a/tools/ci/scripts/circleci/gcc7_tests.sh +++ b/tools/ci/scripts/circleci/gcc7_tests.sh @@ -5,25 +5,25 @@ echo "Current node: ${CIRCLE_NODE_INDEX}" case $CIRCLE_NODE_INDEX in 0) - export IMAGE=debian:unstable + export IMAGE=debian:buster export COMMAND="./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --without-opengl --enable-glibcdebug --with-sdl2" export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL2} valgrind" ./tools/ci/scripts/docker_run.sh ;; 1) - export IMAGE=vicamo/debian:sid-i386 + export IMAGE=i386/debian:buster export COMMAND="./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --without-opengl --enable-glibcdebug --with-sdl2" export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL2} valgrind" ./tools/ci/scripts/docker_run.sh ;; 2) - export IMAGE=debian:unstable + export IMAGE=debian:buster export COMMAND="./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --without-opengl --enable-glibcdebug" export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL1} valgrind" ./tools/ci/scripts/docker_run.sh ;; 3) - export IMAGE=vicamo/debian:sid-i386 + export IMAGE=i386/debian:buster export COMMAND="./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --without-opengl" export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL1} valgrind" ./tools/ci/scripts/docker_run.sh -- cgit v1.2.3-60-g2f50