From 1778fd00da89966308fc7ae9a968471122953326 Mon Sep 17 00:00:00 2001 From: Robin Deits Date: Tue, 20 Jun 2017 17:00:35 -0700 Subject: [PATCH 1/3] don't require compat --- REQUIRE | 1 - 1 file changed, 1 deletion(-) diff --git a/REQUIRE b/REQUIRE index fd1498b..280e41d 100644 --- a/REQUIRE +++ b/REQUIRE @@ -2,6 +2,5 @@ julia 0.6 BinDeps MathProgBase Polyhedra 0.2 0.3 -Compat 0.17 @windows WinRPM @osx Homebrew From 277f951b19d24a89f31514a61e6b6b941da59aaa Mon Sep 17 00:00:00 2001 From: Robin Deits Date: Tue, 20 Jun 2017 17:03:28 -0700 Subject: [PATCH 2/3] more specific requirements --- REQUIRE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/REQUIRE b/REQUIRE index 280e41d..945b85c 100644 --- a/REQUIRE +++ b/REQUIRE @@ -1,6 +1,6 @@ julia 0.6 -BinDeps -MathProgBase +BinDeps 0.4.7 +MathProgBase 0.6 Polyhedra 0.2 0.3 @windows WinRPM @osx Homebrew From 3850fe28dc95209adb21dbfe8263924ab06115c6 Mon Sep 17 00:00:00 2001 From: Robin Deits Date: Tue, 20 Jun 2017 17:08:17 -0700 Subject: [PATCH 3/3] remove unnecessary checkouts --- .travis.yml | 8 +++----- appveyor.yml | 3 +-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 218a589..37a5549 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,11 +11,9 @@ addons: notifications: email: false # uncomment the following lines to override the default test script -script: - - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi - - julia -e 'Pkg.init(); Pkg.add("GeometryTypes"); Pkg.checkout("GeometryTypes")' - - julia -e 'Pkg.clone("https://github.com/JuliaPolyhedra/Polyhedra.jl"); Pkg.checkout("Polyhedra"); Pkg.build("Polyhedra")' - - julia -e 'Pkg.clone(pwd()); Pkg.build("CDDLib"); Pkg.test("CDDLib"; coverage=true)' +# script: +# - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi +# - julia -e 'Pkg.clone(pwd()); Pkg.build("CDDLib"); Pkg.test("CDDLib"; coverage=true)' after_success: # push coverage results to Coveralls - julia -e 'cd(Pkg.dir("CDDLib")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder())' diff --git a/appveyor.yml b/appveyor.yml index 7f16db3..8c08be8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,8 +27,7 @@ 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.init(); Pkg.add(\"GeometryTypes\"); Pkg.checkout(\"GeometryTypes\"); - Pkg.clone(\"https://github.com/JuliaPolyhedra/Polyhedra.jl\"); Pkg.checkout(\"Polyhedra\"); + Pkg.init(); Pkg.clone(pwd(), \"CDDLib\"); Pkg.build(\"CDDLib\")" test_script: