diff options
| author | sfan5 <sfan5@live.de> | 2020-03-08 21:05:12 +0100 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2020-03-12 00:10:09 +0100 |
| commit | 7908b20dd975f9f9b08afbaafbb1501fe07da21c (patch) | |
| tree | 2bd0fd4c662fa2f0e10d75ab8ea02f8337dbf864 | |
| parent | 245876cddb6989dcad78f13aff9cd0d1cefa150e (diff) | |
| download | minetest-7908b20dd975f9f9b08afbaafbb1501fe07da21c.tar.gz minetest-7908b20dd975f9f9b08afbaafbb1501fe07da21c.tar.bz2 minetest-7908b20dd975f9f9b08afbaafbb1501fe07da21c.zip | |
buildbot: Update to newer MinGW gcc 9.2
| -rw-r--r-- | .gitlab-ci.yml | 8 | ||||
| -rwxr-xr-x | util/travis/before_install.sh | 12 |
2 files changed, 8 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dbc532090..e4691284f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -239,13 +239,13 @@ build:fedora-24: ## .generic_win_template: &generic_win_template - image: ubuntu:xenial + image: ubuntu:bionic before_script: - apt-get update -y - - apt-get install -y p7zip-full wget unzip git cmake gettext - - wget http://minetest.kitsunemimi.pw/mingw-w64-${WIN_ARCH}_7.1.1_ubuntu14.04.7z -O mingw.7z > /dev/null + - apt-get install -y wget xz-utils unzip git cmake gettext + - wget -q http://minetest.kitsunemimi.pw/mingw-w64-${WIN_ARCH}_9.2.0_ubuntu18.04.tar.xz -O mingw.tar.xz - sed -e "s|%PREFIX%|${WIN_ARCH}-w64-mingw32|" -e "s|%ROOTPATH%|/usr/${WIN_ARCH}-w64-mingw32|" < util/travis/toolchain_mingw.cmake.in > ${TOOLCHAIN_OUTPUT} - - 7z x -y -o/usr mingw.7z > /dev/null + - tar -xaf mingw.tar.xz -C /usr .build_win_template: &build_win_template <<: *generic_win_template diff --git a/util/travis/before_install.sh b/util/travis/before_install.sh index fe9243583..649486dad 100755 --- a/util/travis/before_install.sh +++ b/util/travis/before_install.sh @@ -17,17 +17,13 @@ if [[ $PLATFORM == "Unix" ]] || [[ ! -z "${CLANG_TIDY}" ]]; then install_macosx_deps fi elif [[ $PLATFORM == "Win32" ]]; then - sudo apt-get update - sudo apt-get install p7zip-full - wget http://minetest.kitsunemimi.pw/mingw-w64-i686_7.1.1_ubuntu14.04.7z -O mingw.7z + wget http://minetest.kitsunemimi.pw/mingw-w64-i686_9.2.0_ubuntu18.04.tar.xz -O mingw.tar.xz # buildwin32.sh detects the installed toolchain automatically - sudo 7z x -y -o/usr mingw.7z + sudo tar -xaf mingw.tar.xz -C /usr elif [[ $PLATFORM == "Win64" ]]; then - sudo apt-get update - sudo apt-get install p7zip-full - wget http://minetest.kitsunemimi.pw/mingw-w64-x86_64_7.1.1_ubuntu14.04.7z -O mingw.7z + wget http://minetest.kitsunemimi.pw/mingw-w64-x86_64_9.2.0_ubuntu18.04.tar.xz -O mingw.tar.xz sed -e "s|%PREFIX%|x86_64-w64-mingw32|" \ -e "s|%ROOTPATH%|/usr/x86_64-w64-mingw32|" \ < util/travis/toolchain_mingw.cmake.in > util/buildbot/toolchain_mingw64.cmake - sudo 7z x -y -o/usr mingw.7z + sudo tar -xaf mingw.tar.xz -C /usr fi |