diff --git a/.github/workflows/demos.yml b/.github/workflows/demos.yml index 194323e5..d54ca968 100644 --- a/.github/workflows/demos.yml +++ b/.github/workflows/demos.yml @@ -34,8 +34,8 @@ jobs: ${{ runner.os }}-test-${{ env.cache-name }}- ${{ runner.os }}-test- ${{ runner.os }}- - - name: Setup TeX Live - uses: teatimeguest/setup-texlive-action@v3 + - name: Install TeX Live + uses: zauguin/install-texlive@v4 with: packages: >- scheme-minimal @@ -50,7 +50,7 @@ jobs: epstopdf-pkg # - name: Setup tmate session # uses: mxschmitt/action-tmate@v3 - - name: Develop package + - name: Instantiate project run: | using Pkg Pkg.develop(path = ".") @@ -58,23 +58,20 @@ jobs: shell: julia --project="examples" --color=yes {0} - name: Run BPDN demo run: | - pkg_path = dirname(Base.find_package("RegularizedOptimization")) - include(joinpath(pkg_path, "..", "examples", "demo-bpdn.jl")) - shell: julia --project="examples" --color=yes {0} + julia --project=examples -e ' + include("examples/demo-bpdn.jl") + ' - name: Run contrained BPDN demo run: | - pkg_path = dirname(Base.find_package("RegularizedOptimization")) - include(joinpath(pkg_path, "..", "examples", "demo-bpdn-constr.jl")) + include("examples/demo-bpdn-constr.jl") shell: julia --project="examples" --color=yes {0} #- name: Run FH demo # run: | - # pkg_path = dirname(Base.find_package("RegularizedOptimization")) - # include(joinpath(pkg_path, "..", "examples", "demo-fh.jl")) + # include("examples/demo-fh.jl") # shell: julia --project="examples" --color=yes {0} - name: Run NNMF demo run: | - pkg_path = dirname(Base.find_package("RegularizedOptimization")) - include(joinpath(pkg_path, "..", "examples", "demo-nnmf-constr.jl")) + include("examples/demo-nnmf-constr.jl") shell: julia --project="examples" --color=yes {0} - name: Upload results uses: actions/upload-artifact@v4 diff --git a/examples/Project.toml b/examples/Project.toml index 1fc96131..365f5e4e 100644 --- a/examples/Project.toml +++ b/examples/Project.toml @@ -5,7 +5,7 @@ NLPModels = "a4795742-8479-5a88-8948-cc11e1c8c1a6" NLPModelsModifiers = "e01155f1-5c6f-4375-a9d8-616dd036575f" PGFPlots = "3b7a836e-365b-5785-a47d-02c71176b4aa" ProximalOperators = "a725b495-10eb-56fe-b38b-717eba820537" -RegularizedOptimization = "196f2941-2d58-45ba-9f13-43a2532b2fa8" +RegularizedOptimization = "20620ad1-4fe4-4467-ae46-fb087718fe7b" RegularizedProblems = "ea076b23-609f-44d2-bb12-a4ae45328278" ShiftedProximalOperators = "d4fd37fa-580c-4e43-9b30-361c21aae263" @@ -16,6 +16,6 @@ NLPModels = "0.19, 0.20, 0.21" NLPModelsModifiers = "0.7" PGFPlots = "^3.4" ProximalOperators = "0.15" -RegularizedOptimization = "0.1" +RegularizedOptimization = "0.1, 0.2" RegularizedProblems = "0.1" ShiftedProximalOperators = "0.2"