Skip to content

Commit

Permalink
Fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
blegat committed Apr 14, 2019
1 parent 816ab38 commit a6c3052
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 22 deletions.
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ os:
- linux
- osx
julia:
- 0.7
- 1.0
- 1.1
notifications:
email: false
# CSDP needs lapack and blas
Expand All @@ -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())'
2 changes: 1 addition & 1 deletion REQUIRE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
julia 0.7
julia 1.1
Combinatorics
MathOptInterface
JuMP
Expand Down
32 changes: 16 additions & 16 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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%"
1 change: 0 additions & 1 deletion test/REQUIRE
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
CSDP
SDPA

0 comments on commit a6c3052

Please sign in to comment.