Skip to content

Commit

Permalink
Merge f278db4 into ed1ecdc
Browse files Browse the repository at this point in the history
  • Loading branch information
TeroFrondelius committed Oct 7, 2019
2 parents ed1ecdc + f278db4 commit aa99ccb
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 10 deletions.
24 changes: 17 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,29 @@
language: julia
os:
- linux
- linux
julia:
- 1.0
- 1.2
- nightly
- 1.0
- 1.2
- 1.3
- nightly
matrix:
allow_failures:
- julia: nightly
fast_finish: true
notifications:
email: false

jobs:
include:
- stage: "Documentation"
os: linux
script:
- julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate(); Pkg.build()'
- julia --project=docs/ docs/make.jl
after_success:
- julia --project=docs/ docs/deploy.jl

script:
- julia --project -e 'using Pkg; Pkg.add(PackageSpec(url="https://github.com/JuliaFEM/Materials.jl"));
Pkg.build();
Pkg.test(; coverage=true)'
- julia --project -e 'using Pkg; Pkg.build(); Pkg.test(; coverage=true)'
after_success:
- julia -e 'import Pkg; Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
9 changes: 8 additions & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "FEMMaterials"
uuid = "0c6c1f6c-65b6-54d6-9cff-6b64003af638"
authors = ["Jukka Aho <ahojukka5@gmail.com>", "Joona Vaara <joona_vaara@hotmail.com>"]
version = "0.0.0"
version = "0.1.0"

[deps]
FEMBase = "fbcbbc08-f1bf-5204-9233-b69f5d396135"
Expand All @@ -10,8 +10,15 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Materials = "35fa313e-aa48-52ea-bc82-ddb91c7db87b"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
Tensors = "48a634ad-e948-5137-8d70-aa71f2a747f4"
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
JuliaFEM = "f80590ac-b429-510a-8a99-e7c46989f22d"


[compat]
julia = ">= 1.0.0" # [1.0.0, ∞)
Materials = ">= 0.2.0" # [0.2.0, ∞)

[extras]
DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Expand Down
7 changes: 7 additions & 0 deletions docs/Project.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[deps]
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
FEMBase = "fbcbbc08-f1bf-5204-9233-b69f5d396135"
JuliaFEM = "f80590ac-b429-510a-8a99-e7c46989f22d"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
6 changes: 4 additions & 2 deletions docs/deploy.jl
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,7 @@ using Documenter
using FEMMaterials

deploydocs(
deps = Deps.pip("mkdocs", "python-markdown-math"),
repo = "github.com/JuliaFEM/FEMMaterials.jl.git")
repo = "github.com/JuliaFEM/FEMMaterials.jl.git",
target = "build",
deps = nothing,
make = nothing)

0 comments on commit aa99ccb

Please sign in to comment.