Alright, screw this, no Windows support

Getting real sick of waiting 10 minutes for MSYS2 to reinstall itself
just so Make can fail with no error message
This commit is contained in:
Clownacy 2020-01-23 20:17:44 +00:00
parent f84289a190
commit 6008550295

View file

@ -18,9 +18,8 @@ compiler:
- clang
os:
# - linux
# - osx
- windows
- linux
- osx
addons:
apt:
@ -53,26 +52,6 @@ env:
- MAKE_BUILD_TYPE=RELEASE=1 CMAKE_BUILD_TYPE=RelWithDebInfo
before_install:
# Setup MSYS2
- |-
case $TRAVIS_OS_NAME in
windows)
[[ ! -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 mingw32="$msys2 -mingw32 -full-path -here -c "\"\$@"\" --"
export mingw64="$msys2 -mingw64 -full-path -here -c "\"\$@"\" --"
export msys2+=" -msys2 -c "\"\$@"\" --"
$msys2 pacman --sync --noconfirm --needed make mingw-w64-i686-toolchain mingw-w64-x86_64-toolchain mingw-w64-i686-clang mingw-w64-x86_64-clang mingw-w64-i686-make mingw-w64-x86_64-make mingw-w64-i686-cmake mingw-w64-x86_64-cmake mingw-w64-i686-SDL2 mingw-w64-x86_64-SDL2 mingw-w64-i686-freetype mingw-w64-x86_64-freetype mingw-w64-i686-fltk mingw-w64-x86_64-fltk
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
;;
esac
# Set URL for Discord send script
- DISCORD_SEND_SCRIPT_URL=https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh
- DISCORD_SEND_SCRIPT_FILENAME=discordSendNotification.sh
@ -105,28 +84,11 @@ before_install:
fi
# Display compilers/cmake name/version
- |
if [ "$TRAVIS_OS_NAME" != "windows" ]; then
echo ${CC}
echo ${CXX}
${CC} --version
${CXX} --version
cmake --version
fi
before_cache:
- |-
case $TRAVIS_OS_NAME in
windows)
# https://unix.stackexchange.com/a/137322/107554
$msys2 pacman --sync --clean --noconfirm
;;
esac
cache:
directories:
- $HOME/AppData/Local/Temp/chocolatey
- /C/tools/msys64
- echo ${CC}
- echo ${CXX}
- ${CC} --version
- ${CXX} --version
- cmake --version
install:
# Get number of cores (or 2 by default if somehow none of these are available somehow)
@ -136,9 +98,6 @@ install:
# Recommanded build directory
- CMAKE_BUILD_DIR=build
# Extra build directory for 64-bit Windows builds
- CMAKE_BUILD_DIR2=build_mingw64
# Install ccache on OSX
- |
if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
@ -147,37 +106,20 @@ install:
export PATH="/usr/local/opt/ccache/libexec:$PATH"
fi
# Install required libraries
- mkdir travisLibs && cd travisLibs
# Finished installing required libraries
- cd ..
before_script:
# Make build directory and generate CMake build files
- |
if [ "${TRAVIS_OS_NAME}" != "windows" ]; then
mkdir -p ${CMAKE_BUILD_DIR} && cd ${CMAKE_BUILD_DIR}
cmake .. -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DFIX_BUGS=ON -DWARNINGS=ON -DWARNINGS_ALL=ON
cd ..
fi
- mkdir -p ${CMAKE_BUILD_DIR} && cd ${CMAKE_BUILD_DIR}
- cmake .. -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DFIX_BUGS=ON -DWARNINGS=ON -DWARNINGS_ALL=ON
- cd ..
script:
# CMake build
- |
if [ "${TRAVIS_OS_NAME}" != "windows" ]; then
cd ${CMAKE_BUILD_DIR}
$mingw32 cmake --build . --config $CMAKE_BUILD_TYPE --parallel $JOBS
cd ..
fi
- cd ${CMAKE_BUILD_DIR}
- cmake --build . --config $CMAKE_BUILD_TYPE --parallel $JOBS
- cd ..
# Make build
- $mingw32 make -j $JOBS FIX_BUGS=1 $MAKE_BUILD_TYPE WARNINGS=1 WARNINGS_ALL=1
- |
if [ "${TRAVIS_OS_NAME}" == "windows" ]; then
$mingw64 make -j $JOBS FIX_BUGS=1 $MAKE_BUILD_TYPE WARNINGS=1 WARNINGS_ALL=1
fi
- make -j $JOBS FIX_BUGS=1 $MAKE_BUILD_TYPE WARNINGS=1 WARNINGS_ALL=1
after_success:
# Send success notification to Discord through DISCORD_WEBHOOK_URL