diff --git a/.travis.yml b/.travis.yml index 5a17de9..e362be4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -77,20 +77,22 @@ matrix: - JDK="adopt-openj9@1.11" before_install: - [[ ! -f C:/tools/msys64/msys2_shell.cmd ]] && rm -rf C:/tools/msys64 - choco uninstall -y mingw - choco upgrade --no-progress -y msys2 - export msys2='cmd //C RefreshEnv.cmd ' - export msys2+='& set MSYS=winsymlinks:nativestrict ' - export msys2+='& C:\\tools\\msys64\\msys2_shell.cmd -defterm -no-start' - export mingw64="$msys2 -mingw64 -full-path -here -c "\"\$@"\" --" - export msys2+=" -msys2 -c "\"\$@"\" --" - $msys2 pacman --sync --noconfirm --needed mingw-w64-x86_64-toolchain libtool automake - taskkill //IM gpg-agent.exe //F # https://travis-ci.community/t/4967 - export PATH=/C/tools/msys64/mingw64/bin:$PATH - export MAKE=mingw32-make # so that Autotools can find it - ;; + - choco uninstall -y mingw + - choco upgrade --no-progress -y msys2 + - export msys2='cmd //C RefreshEnv.cmd ' + - export msys2+='& set MSYS=winsymlinks:nativestrict ' + - export msys2+='& C:\\tools\\msys64\\msys2_shell.cmd -defterm -no-start' + - export mingw64="$msys2 -mingw64 -full-path -here -c "\"\$@"\" --" + - export msys2+=" -msys2 -c "\"\$@"\" --" + - $msys2 pacman --sync --noconfirm --needed mingw-w64-x86_64-toolchain libtool automake + - taskkill //IM gpg-agent.exe //F # https://travis-ci.community/t/4967 + - export PATH=/C/tools/msys64/mingw64/bin:$PATH + - export MAKE=mingw32-make # so that Autotools can find it - curl "${GRAVIS}.install-jdk-travis.sh" --output ~/.install-jdk-travis.sh - source ~/.install-jdk-travis.sh + before_cache: + # https://unix.stackexchange.com/a/137322/107554 + - $msys2 pacman --sync --clean --noconfirm script: - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then ./windowsBuild.sh; fi' - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ./windowsBuildAndPublish.sh; fi'