From a67b4a041e0e02d2131eaf5af54be8f6e67b0fbc Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Thu, 17 Jan 2019 13:41:01 -0800 Subject: [PATCH] Add new alternate repository for mxe (#27644) * Add new alternate repository for mxe The mxe project has migrated its packages to http://mirror.mxe.cc/repos/apt --- .travis.yml | 4 +--- build-scripts/requirements.sh | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0560999c7a9f1..3990187b366c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,17 +48,15 @@ jobs: packages: ["g++-8", "g++-8-multilib", "libc6-dbg", "libc6-dbg:i386", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev"] sources: *apt_sources - # MXE variants disabled while pkg.mxe.cc is down + # MXE variants using alternate repository http://mirror.mxe.cc/repos/apt # GCC MinGW - env: COMPILER='g++' LDFLAGS='-static-libgcc -static-libstdc++' MXE_TARGET='i686-w64-mingw32.static' WINE='wine' - if: type = disabled addons: &gcc apt: packages: ["wine"] # Windows Tiles - env: COMPILER='g++' LDFLAGS='-static-libgcc -static-libstdc++' MXE_TARGET='i686-w64-mingw32.static' WINE='wine' TILES=1 SOUND=1 - if: type = disabled compiler: gcc addons: &gcc apt: diff --git a/build-scripts/requirements.sh b/build-scripts/requirements.sh index 632e5c05a01e8..c77c28a0195cf 100644 --- a/build-scripts/requirements.sh +++ b/build-scripts/requirements.sh @@ -10,10 +10,8 @@ fi # Influenced by https://github.com/zer0main/battleship/blob/master/build/windows/requirements.sh if [ -n "${MXE_TARGET}" ]; then - echo "deb http://pkg.mxe.cc/repos/apt/debian wheezy main" \ - | sudo tee /etc/apt/sources.list.d/mxeapt.list - travis_retry sudo apt-key adv --keyserver x-hkp://keyserver.ubuntu.com:80 \ - --recv-keys D43A795B73B16ABE9643FE1AFD8FFF16DB45C6AB + sudo add-apt-repository 'deb [arch=amd64] https://mirror.mxe.cc/repos/apt xenial main' + travis_retry sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 84C7C89FC632241A6999ED0A580873F586B72ED9 # We need to treat apt-get update warnings as errors for which the exit code # is not sufficient. The following workaround inspired by # https://unix.stackexchange.com/questions/175146/apt-get-update-exit-status/