From 8bbd4cf0c1814a9420a342fd6870507b333f5438 Mon Sep 17 00:00:00 2001 From: hakanergun Date: Tue, 20 Aug 2019 16:49:11 +0200 Subject: [PATCH] Fix travis + project.toml --- .travis.yml | 38 +++++++++++++++++++++++++------------- Project.toml | 2 +- gen_pr.jl | 2 +- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index bc80dd64..285896da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,24 +1,36 @@ language: julia os: - linux - - osx julia: - 1.1 - nightly matrix: allow_failures: - julia: nightly +cache: + directories: + - /home/travis/.julia +sudo: false +addons: + apt_packages: + - gfortran + - liblapack-dev + - libgmp-dev + - libglpk-dev + +before_install: + # don't keep an old version of the code in the cache + # - julia -e 'using Pkg; if "PowerModels" in keys(Pkg.installed()) Pkg.rm("PowerModels"); Pkg.rm("PowerModels"); Pkg.add("https://github.com/lanl-ansi/PowerModels.jl.git") end' + # - julia -e 'using Pkg; if "PowerModelsACDC" in keys(Pkg.installed()) Pkg.rm("PowerModelsACDC"); Pkg.rm("PowerModelsACDC") end' + # - julia -e 'using Pkg; Pkg.update()' #make sure we get the latest version of METADATA +- julia -e 'using Pkg; Pkg.add("Ipopt")' +- julia -e 'using Pkg; Pkg.add("SCS")' +- julia -e 'using Pkg; if !("Documenter" in keys(Pkg.installed())) Pkg.add("Documenter") end' + script: - - julia --project -e 'import Pkg; Pkg.build(); Pkg.instantiate()' - - julia --project -e 'import Pkg; Pkg.test(coverage=true);' + - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi + # - julia -e 'using Pkg; Pkg.clone(pwd())' + - julia -e 'using Pkg; Pkg.test("PowerModelsACDC")' + after_success: - - julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())' -jobs: - include: - - stage: "Documentation" - julia: 1.1 - os: linux - script: - - julia --project=docs/ -e 'using Pkg; Pkg.instantiate(); Pkg.develop(PackageSpec(path=pwd()))' - - julia --project=docs/ docs/make.jl - after_success: skip + - julia -e 'using Pkg; cd(Pkg.dir("PowerModelsACDC")); include(joinpath("docs", "make.jl"))' \ No newline at end of file diff --git a/Project.toml b/Project.toml index 524fb715..1f3b0955 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "PowerModelsACDC" uuid = "ff45984e-d068-5f4c-9e32-c4133509d236" -autors = "Hakan Ergun" +autors = ["Hakan Ergun", "Frederik Geth"] repo = "https://github.com/hakanergun/PowerModelsACDC.jl" version = "0.1.0" diff --git a/gen_pr.jl b/gen_pr.jl index 86592447..7775543c 100644 --- a/gen_pr.jl +++ b/gen_pr.jl @@ -116,7 +116,7 @@ for arg in ARGS project = Dict( "name" => name, "uuid" => uuid(name), - "autors" => "Hakan Ergun", + "autors" => ["Hakan Ergun", "Frederik Geth"], "repo" => "https://github.com/hakanergun/PowerModelsACDC.jl", "version" => "0.1.0", "deps" => Dict{String,String}(),