From bd19dd95e077baa405e7e4b1dbc22ecca4a0d6ed Mon Sep 17 00:00:00 2001
From: Jeff Becker <jeff@i2p.rocks>
Date: Tue, 21 Apr 2020 10:04:20 -0400
Subject: [PATCH] revert makefile and travis

---
 .travis.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 36e434e75..9407c2817 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,15 +9,13 @@ matrix:
   - name: "lint check"
     os: linux
     compiler: gcc
-    env: PATH="/usr/lib/llvm-9/bin:$PATH"
+    env: MAKE_TARGET=format-verify PATH="/usr/lib/llvm-9/bin:$PATH"
     addons:
       apt:
         sources:
           - llvm-toolchain-bionic-9
         packages:
           - clang-format-9
-    script:
-      - make format-verify
   - name: "make debug (linux/gcc)"
     os: linux
     compiler: gcc
@@ -211,11 +209,11 @@ before_install:
 
 script:
   - if [ "$TRAVIS_OS_NAME" == "windows" ]; then
-      cmd.exe /C '"C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" amd64 mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DNATIVE_BUILD=${NATIVE:-ON} -DSTATIC_LINK_RUNTIME=${STATIC_LINK:-OFF} -DDOWNLOAD_SODIUM=${DOWNLOAD_SODIUM:-ON} .. && make';
+      cmd.exe /C '"C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" amd64 && make test';
     elif [[ ! -z $DOCKER_FILE ]]; then
       docker build -f $DOCKER_FILE .;
     else
-      mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DNATIVE_BUILD=${NATIVE:-ON} -DSTATIC_LINK=${STATIC_LINK:-OFF} -DDOWNLOAD_SODIUM=${DOWNLOAD_SODIUM:-ON} .. && make ${MAKE_TARGET:-test};
+      make DOWNLOAD_SODIUM=ON ${MAKE_TARGET:-test};
     fi
 
 after_script: