summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2019-01-27 00:49:59 +0300
committerAndrei Karas <akaras@inbox.ru>2019-01-27 00:49:59 +0300
commit8ac2fff6ec50ec3bad41370e376877a0a8b6eb97 (patch)
tree99269f3c2b18aea6daae0db18d53befdb8dcf6c1
parent34d7d873da6598f4bf0fbaff5828f222d4c1037c (diff)
downloadmanaplus-8ac2fff6ec50ec3bad41370e376877a0a8b6eb97.tar.gz
manaplus-8ac2fff6ec50ec3bad41370e376877a0a8b6eb97.tar.bz2
manaplus-8ac2fff6ec50ec3bad41370e376877a0a8b6eb97.tar.xz
manaplus-8ac2fff6ec50ec3bad41370e376877a0a8b6eb97.zip
Fix travis and azure ci config files
-rw-r--r--.travis.yml4
-rw-r--r--azure-pipelines_macosx.yml2
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 7a4ffe237..33e39becb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,7 +62,7 @@ env:
valgrind"
# i386, sdl1, --disable-tmwa
- - IMAGE=386/ubuntu:cosmic
+ - IMAGE=i386/ubuntu:cosmic
COMMAND="./tools/ci/jobs/gcc5.sh --enable-werror --disable-tmwa"
PACKAGES="gcc-5 g++-5
${LIBS_PACKAGES} ${SDL1}"
@@ -74,7 +74,7 @@ env:
COMMAND="./tools/ci/jobs/gcc7.sh --enable-werror --disable-tmwa"
PACKAGES="gcc-7 g++-7
${LIBS_PACKAGES} ${SDL1}"
- - IMAGE=386/ubuntu:cosmic
+ - IMAGE=i386/ubuntu:cosmic
COMMAND="./tools/ci/jobs/gcc5_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame"
PACKAGES="gcc-5 g++-5
${LIBS_PACKAGES} ${SDL1}
diff --git a/azure-pipelines_macosx.yml b/azure-pipelines_macosx.yml
index 9d6051e1d..43e2d0c20 100644
--- a/azure-pipelines_macosx.yml
+++ b/azure-pipelines_macosx.yml
@@ -35,7 +35,7 @@ jobs:
pool:
name: 'Hosted Ubuntu 1604'
dependsOn:
- - xcode_8
+ - xcode_10
- xcode_9
- xcode
- xcode_8_3_3