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
10 changes: 6 additions & 4 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,19 @@ jobs:
version: ${{ matrix.version }}
arch: ${{ matrix.arch }}
- uses: julia-actions/cache@v3
# ProximalSolvers and CovarianceSelection are not registered yet: both from
# their masters. Julia 1.11 and later take them from [sources] in
# ProximalSolvers, CovarianceSelection and the ProximalBase that
# CovarianceSelection needs (SliceSum, FiberSum) are not registered yet: all
# from their masters. Julia 1.11 and later take them from [sources] in
# Project.toml; Julia 1.10 ignores [sources], and resolves each Pkg.add with
# the whole project, so both are added in one call. Remove the step and
# the whole project, so they are added in one call. Remove the step and
# [sources] once they are registered.
- name: Add the unregistered dependencies from GitHub on Julia 1.10
if: matrix.version == 'lts'
shell: julia --color=yes --project=. {0}
run: |
using Pkg
Pkg.add([PackageSpec(url="https://github.com/mlakolar/ProximalSolvers.jl", rev="master"),
Pkg.add([PackageSpec(url="https://github.com/mlakolar/ProximalBase.jl", rev="master"),
PackageSpec(url="https://github.com/mlakolar/ProximalSolvers.jl", rev="master"),
PackageSpec(url="https://github.com/mlakolar/CovarianceSelection.jl", rev="master")])
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-runtest@v1
Expand Down
1 change: 1 addition & 0 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"

[sources]
CovarianceSelection = {url = "https://github.com/mlakolar/CovarianceSelection.jl", rev = "master"}
ProximalBase = {url = "https://github.com/mlakolar/ProximalBase.jl", rev = "master"}
ProximalSolvers = {url = "https://github.com/mlakolar/ProximalSolvers.jl", rev = "master"}

[compat]
Expand Down
1 change: 1 addition & 0 deletions benchmark/compare/new/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
[sources]
CovarianceSelection = {url = "https://github.com/mlakolar/CovarianceSelection.jl", rev = "master"}
DiffPrecTest = {path = "../../.."}
ProximalBase = {url = "https://github.com/mlakolar/ProximalBase.jl", rev = "master"}
ProximalSolvers = {url = "https://github.com/mlakolar/ProximalSolvers.jl", rev = "master"}

[compat]
Expand Down
1 change: 1 addition & 0 deletions exper/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
[sources]
CovarianceSelection = {url = "https://github.com/mlakolar/CovarianceSelection.jl", rev = "master"}
DiffPrecTest = {path = ".."}
ProximalBase = {url = "https://github.com/mlakolar/ProximalBase.jl", rev = "master"}
ProximalSolvers = {url = "https://github.com/mlakolar/ProximalSolvers.jl", rev = "master"}

[compat]
Expand Down
7 changes: 4 additions & 3 deletions exper/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ With Julia 1.11 or later:
julia --project=. -e 'using Pkg; Pkg.instantiate()'
```

`Project.toml` takes DiffPrecTest from this repository and CovarianceSelection from GitHub.
Julia 1.10 ignores these sources; there, run
`using Pkg; Pkg.develop(path=".."); Pkg.add(url="https://github.com/mlakolar/CovarianceSelection.jl")`
`Project.toml` takes DiffPrecTest from this repository, and CovarianceSelection,
ProximalSolvers and ProximalBase from their masters on GitHub, until they are
registered. Julia 1.10 ignores these sources; there, run
`using Pkg; Pkg.develop(path=".."); Pkg.add([PackageSpec(url="https://github.com/mlakolar/ProximalBase.jl", rev="master"), PackageSpec(url="https://github.com/mlakolar/ProximalSolvers.jl", rev="master"), PackageSpec(url="https://github.com/mlakolar/CovarianceSelection.jl", rev="master")])`
once instead.

## Running
Expand Down
Loading