diff --git a/.travis.yml b/.travis.yml
index 2b871274..b6807555 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,9 +15,6 @@ matrix:
packages:
- doxygen
- os: osx
- - os: windows
- cache:
- - ccache: false
compiler:
- clang
@@ -33,20 +30,16 @@ before_install:
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install qt5 && brew cask install xquartz && brew install rust; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo mkdir -p /etc/docker && echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json && sudo service docker restart; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then ci/build-docker-image.sh docker/ci/Dockerfile nanocurrency/nano-ci; fi
- - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install -y nuget.commandline; fi
install:
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install ccache; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi
- - if [ "$TRAVIS_OS_NAME" = "windows" ]; then util/build_prep/windows/prep.sh; fi
script:
- if [ -n "$ONE_TIME_TESTS" ]; then ci/check-commit-format.sh; fi
- if [ -n "$ONE_TIME_TESTS" ]; then doxygen doxygen.config; fi # TODO also deploy the built HTML
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then ci/build-travis.sh "/usr/local/opt/qt5/lib/cmake/Qt5"; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then docker run -v $TRAVIS_BUILD_DIR:/workspace -v $HOME/.ccache:/ccache -v $HOME/.cargo:/cargo nanocurrency/nano-ci /bin/bash -c "apt install ccache; cd /workspace && ASAN=${ASAN} TSAN=${TSAN} CCACHE_DIR=/ccache CARGO_HOME=/cargo ./ci/build-travis.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}"; fi
- - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ./ci/build-travis-win.sh; fi
- - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ./ci/test.sh ./build_win/Debug; fi
deploy:
provider: script
diff --git a/ci/build-travis-win.sh b/ci/build-travis-win.sh
deleted file mode 100644
index abfe3e33..00000000
--- a/ci/build-travis-win.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-export PATH="$PATH:/c/Program Files (x86)/Microsoft Visual Studio/Installer/"
-export MSVC=$(vswhere -latest -products "*" -requires Microsoft.Component.MSBuild -property installationPath)
-export MSVC=$(echo /$MSVC | sed -e 's/\\/\//g' -e 's/://')
-export PATH="$PATH:$MSVC/MSBuild/15.0/Bin/"
-
-NANO_ROOT=`PWD`
-mkdir build_win
-cd build_win
-
-cmake \
- -G'Visual Studio 15 2017 Win64' \
- -DACTIVE_NETWORK=nano_test_network \
- -DNANO_TEST=ON \
- -DCMAKE_BUILD_TYPE=Debug \
- -DCMAKE_VERBOSE_MAKEFILE=ON \
- -DBOOST_ROOT="~/platform/boost/" \
- -DIPHLPAPI_LIBRARY="/c/Program Files (x86)/Windows Kits/10/Lib/10.0.17134.0/um/x64/iphlpapi.Lib" \
- -DWINSOCK2_LIBRARY="/c/Program Files (x86)/Windows Kits/10/Lib/10.0.17134.0/um/x64/WS2_32.Lib" \
- -Dgtest_force_shared_crt=true \
- $NANO_ROOT
-
-cmd.exe /C "MSBuild.exe \"nano/core_test/core_test.vcxproj\" /m"
diff --git a/ci/packages.config b/ci/packages.config
deleted file mode 100644
index 5d28b5de..00000000
--- a/ci/packages.config
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ci/test.sh b/ci/test.sh
index 168ad0f7..ebcc01db 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -58,15 +58,7 @@ run_tests() {
sleep $[60 + (${RANDOM} % 30)]
fi
- case "${OSTYPE}" in
- msys|cygwin)
- executableSuffix='.exe'
- ;;
- *)
- executableSuffix=''
- ;;
- esac
- ${TIMEOUT_CMD} ${TIMEOUT_TIME_ARG} ${TIMEOUT_SEC-${TIMEOUT_DEFAULT}} ./core_test${executableSuffix}
+ ${TIMEOUT_CMD} ${TIMEOUT_TIME_ARG} ${TIMEOUT_SEC-${TIMEOUT_DEFAULT}} ./core_test
core_test_res=${?}
if [ "${core_test_res}" = '0' ]; then
break
diff --git a/util/build_prep/windows/packages.config b/util/build_prep/windows/packages.config
deleted file mode 100644
index b6b14625..00000000
--- a/util/build_prep/windows/packages.config
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/util/build_prep/windows/prep.sh b/util/build_prep/windows/prep.sh
deleted file mode 100644
index 256b7ba6..00000000
--- a/util/build_prep/windows/prep.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-mkdir -p ~/platform/boost/lib
-nuget install ./util/build_prep/windows/packages.config -ExcludeVersion -OutputDirectory ~/tmp
-cp ~/tmp/boost_*/lib/native/libboost*.lib ~/platform/boost/lib
-mv ~/tmp/boost/lib/native/include/* ~/platform/boost/