Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,9 @@ jobs:
- uses: actions/checkout@v2
- uses: julia-actions/setup-julia@v1
- name: Install dependencies
run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd()));'
- name: Install InfrastructureSystems#IS4 in docs environment
run: |
julia --project=docs/ -e '
using Pkg
Pkg.add(PackageSpec(name="InfrastructureSystems", url="https://github.com/NREL-Sienna/InfrastructureSystems.jl.git", rev="IS4"))
Pkg.instantiate()
'
run: julia --color=yes --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd()));'
- name: Build and deploy
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
run: julia --project=docs --color=yes docs/make.jl
run: julia --color=yes --project=docs --color=yes docs/make.jl
19 changes: 1 addition & 18 deletions .github/workflows/main-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,7 @@ jobs:
arch: ${{ matrix.julia-arch }}
- uses: julia-actions/cache@v2
- uses: julia-actions/julia-buildpkg@latest
- name: Install local package in test environment
run: julia --project=test/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd()));'
- name: Install InfrastructureSystems#IS4 in test environment
run: |
julia --project=test -e '
using Pkg
Pkg.add(PackageSpec(name="InfrastructureSystems", url="https://github.com/NREL-Sienna/InfrastructureSystems.jl.git", rev="IS4"))
Pkg.update()
'
- name: Check package status
run: |
julia --project=test -e '
using Pkg; Pkg.status()
using InfrastructureSystems
using InfrastructureOptimizationModels
'
- name: Run tests with coverage
run: julia --project=test --code-coverage=user test/runtests.jl
- uses: julia-actions/julia-runtest@v1
continue-on-error: ${{ matrix.julia-version == 'nightly' }}
- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v4
Expand Down
19 changes: 1 addition & 18 deletions .github/workflows/pr_testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,7 @@ jobs:
arch: ${{ matrix.julia-arch }}
- uses: julia-actions/cache@v2
- uses: julia-actions/julia-buildpkg@latest
- name: Install local package in test environment
run: julia --project=test/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd()));'
- name: Install InfrastructureSystems#IS4 in test environment
run: |
julia --project=test -e '
using Pkg
Pkg.add(PackageSpec(name="InfrastructureSystems", url="https://github.com/NREL-Sienna/InfrastructureSystems.jl.git", rev="IS4"))
Pkg.update()
'
- name: Check package status
run: |
julia --project=test -e '
using Pkg; Pkg.status()
using InfrastructureSystems
using InfrastructureOptimizationModels
'
- name: Run tests with coverage
run: julia --project=test --code-coverage=user test/runtests.jl
- uses: julia-actions/julia-runtest@v1
- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v4
with:
Expand Down
3 changes: 3 additions & 0 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,6 @@ Serialization = "1"
TimeSeries = "~0.25"
TimerOutputs = "~0.5"
julia = "^1.10"

[sources]
InfrastructureSystems = {url = "https://github.com/NREL-Sienna/InfrastructureSystems.jl", rev = "IS4"}
4 changes: 4 additions & 0 deletions docs/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@ DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
DocumenterInterLinks = "d12716ef-a0f6-4df4-a9f1-a5a34e75c656"
InfrastructureOptimizationModels = "bed98974-b02a-5e2f-9ee0-a103f5c45069"
InfrastructureSystems = "2cd47ed4-ca9b-11e9-27f2-ab636a7671f1"
Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"

[compat]
Documenter = "^1.0"
julia = "^1.10"

[sources]
InfrastructureSystems = {url = "https://github.com/NREL-Sienna/InfrastructureSystems.jl", rev = "IS4"}
4 changes: 3 additions & 1 deletion test/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ DataFramesMeta = "1313f7d8-7da2-5740-9ea0-a2ca25f37964"
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
HiGHS = "87dc4568-4c63-4d18-b0c0-bb2238e4078b"
InfrastructureOptimizationModels = "bed98974-b02a-5e2f-9ee0-a103f5c45069"
InfrastructureSystems = "2cd47ed4-ca9b-11e9-27f2-ab636a7671f1"
JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
Expand All @@ -28,3 +27,6 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
[compat]
HiGHS = "1"
julia = "^1.10"

[sources]
InfrastructureSystems = {url = "https://github.com/NREL-Sienna/InfrastructureSystems.jl", rev = "IS4"}
Loading