From a6c3052b13a7c0f1bbff6df28996190e451acba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Legat?= <benoit.legat@gmail.com>
Date: Sun, 14 Apr 2019 17:59:46 +0200
Subject: [PATCH] Fix CI

---
 .travis.yml  |  6 ++----
 REQUIRE      |  2 +-
 appveyor.yml | 32 ++++++++++++++++----------------
 test/REQUIRE |  1 -
 4 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2b22b87..2655ce0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,8 @@ os:
   - linux
   - osx
 julia:
-  - 0.7
   - 1.0
+  - 1.1
 notifications:
   email: false
 # CSDP needs lapack and blas
@@ -14,8 +14,6 @@ before_install:
         sudo apt-get install liblapack-dev libblas-dev;
     fi
 before_script:
-  - julia -e 'using Pkg; Pkg.add(PackageSpec(name="JuMP", rev="master"))'
-  - julia -e 'using Pkg; Pkg.add(PackageSpec(name="PolyJuMP", rev="master"))'
-  - julia -e 'using Pkg; Pkg.add(PackageSpec(name="SumOfSquares", rev="master"))'
+  - julia -e 'using Pkg; Pkg.add(PackageSpec(url="https://github.com/blegat/SetProg.jl.git", rev="master"))'
 after_success:
   - julia -e 'import Pkg; Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder()); Codecov.submit(process_folder())'
diff --git a/REQUIRE b/REQUIRE
index 7948810..0d29bf7 100644
--- a/REQUIRE
+++ b/REQUIRE
@@ -1,4 +1,4 @@
-julia 0.7
+julia 1.1
 Combinatorics
 MathOptInterface
 JuMP
diff --git a/appveyor.yml b/appveyor.yml
index 63fcd61..fdeaf70 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,7 +1,16 @@
 environment:
   matrix:
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
+  - julia_version: 1.0
+
+platform:
+  - x86 # 32-bit
+  - x64 # 64-bit
+
+## uncomment the following lines to allow failures on nightly julia
+## (tests will run but not make your overall status red)
+#matrix:
+#  allow_failures:
+#  - julia_version: latest
 
 branches:
   only:
@@ -15,21 +24,12 @@ notifications:
     on_build_status_changed: false
 
 install:
-  - ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
-# Download most recent Julia Windows binary
-  - ps: (new-object net.webclient).DownloadFile(
-        $env:JULIA_URL,
-        "C:\projects\julia-binary.exe")
-# Run installer silently, output to C:\projects\julia
-  - C:\projects\julia-binary.exe /S /D=C:\projects\julia
+  - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))
 
 build_script:
-# Need to convert from shallow to complete for Pkg.clone to work
-  - IF EXIST .git\shallow (git fetch --unshallow)
-  - C:\projects\julia\bin\julia -e "versioninfo();
-      Pkg.clone(\"https://github.com/JuliaReach/Systems.jl.git\");
-      Pkg.clone(\"https://github.com/blegat/HybridSystems.jl.git\");
-      Pkg.clone(pwd(), \"SwitchOnSafety\"); Pkg.build(\"SwitchOnSafety\")"
+  - echo "%JL_BUILD_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
 
 test_script:
-  - C:\projects\julia\bin\julia -e "Pkg.test(\"SwitchOnSafety\")"
+  - echo "%JL_TEST_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"
diff --git a/test/REQUIRE b/test/REQUIRE
index 5e7f3e7..808c334 100644
--- a/test/REQUIRE
+++ b/test/REQUIRE
@@ -1,2 +1 @@
 CSDP
-SDPA