From ae9a96a934a8f2400655c19a63ee142a03453836 Mon Sep 17 00:00:00 2001 From: jClugstor Date: Tue, 10 Dec 2024 12:24:24 -0500 Subject: [PATCH 1/6] match NonlinearSolve for Downstream DI develop --- .github/workflows/Downstream.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Downstream.yml b/.github/workflows/Downstream.yml index dd57d15a64..89eebf5e98 100644 --- a/.github/workflows/Downstream.yml +++ b/.github/workflows/Downstream.yml @@ -49,10 +49,12 @@ jobs: # the libs haven't been registered yet. - name: "Develop the libraries since they haven't been registered yet" run: | - julia --project=. -e ' - using Pkg; - Pkg.develop(map(path ->Pkg.PackageSpec.(;path="$(@__DIR__)/lib/$(path)"), readdir("./lib"))); - ' + import Pkg + Pkg.Registry.update() + # Install packages present in subdirectories + dev_pks = Pkg.PackageSpec[] + Pkg.develop(map(path -> Pkg.PackageSpec.(;path="$(@__DIR__)/lib/$(path)"), readdir("./lib"))); + Pkg.instantiate() - name: Clone Downstream uses: actions/checkout@v4 with: @@ -80,4 +82,4 @@ jobs: with: token: ${{ secrets.CODECOV_TOKEN }} file: lcov.info - fail_ci_if_error: true + fail_ci_if_error: false From 63a9e018d75143435369cf1f4fd9e4a82649a5d4 Mon Sep 17 00:00:00 2001 From: jClugstor Date: Tue, 10 Dec 2024 13:19:01 -0500 Subject: [PATCH 2/6] forgot the shell --- .github/workflows/Downstream.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Downstream.yml b/.github/workflows/Downstream.yml index 89eebf5e98..639a6e0623 100644 --- a/.github/workflows/Downstream.yml +++ b/.github/workflows/Downstream.yml @@ -55,6 +55,7 @@ jobs: dev_pks = Pkg.PackageSpec[] Pkg.develop(map(path -> Pkg.PackageSpec.(;path="$(@__DIR__)/lib/$(path)"), readdir("./lib"))); Pkg.instantiate() + shell: julia --color=yes --code-coverage=user --depwarn=yes --project=. {0} - name: Clone Downstream uses: actions/checkout@v4 with: From ef10777e1edcd53e920eec300f90a958232564d3 Mon Sep 17 00:00:00 2001 From: jClugstor Date: Tue, 10 Dec 2024 13:59:08 -0500 Subject: [PATCH 3/6] fix CI? --- .github/workflows/Downstream.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Downstream.yml b/.github/workflows/Downstream.yml index 639a6e0623..309b86159b 100644 --- a/.github/workflows/Downstream.yml +++ b/.github/workflows/Downstream.yml @@ -48,14 +48,14 @@ jobs: # This is necessary since the tests are likely to fail otherwise, given that all # the libs haven't been registered yet. - name: "Develop the libraries since they haven't been registered yet" + shell: julia --project=. {0} run: | import Pkg Pkg.Registry.update() # Install packages present in subdirectories dev_pks = Pkg.PackageSpec[] - Pkg.develop(map(path -> Pkg.PackageSpec.(;path="$(@__DIR__)/lib/$(path)"), readdir("./lib"))); + Pkg.develop(map(path -> Pkg.PackageSpec.(;path="/lib/$(path)"), readdir("./lib"))); Pkg.instantiate() - shell: julia --color=yes --code-coverage=user --depwarn=yes --project=. {0} - name: Clone Downstream uses: actions/checkout@v4 with: From b75a786963faab7984b5c7c4c1f7459184b026b4 Mon Sep 17 00:00:00 2001 From: jClugstor Date: Tue, 10 Dec 2024 14:42:11 -0500 Subject: [PATCH 4/6] no slash? --- .github/workflows/Downstream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Downstream.yml b/.github/workflows/Downstream.yml index 309b86159b..dd9322c39d 100644 --- a/.github/workflows/Downstream.yml +++ b/.github/workflows/Downstream.yml @@ -54,7 +54,7 @@ jobs: Pkg.Registry.update() # Install packages present in subdirectories dev_pks = Pkg.PackageSpec[] - Pkg.develop(map(path -> Pkg.PackageSpec.(;path="/lib/$(path)"), readdir("./lib"))); + Pkg.develop(map(path -> Pkg.PackageSpec.(;path="lib/$(path)"), readdir("./lib"))); Pkg.instantiate() - name: Clone Downstream uses: actions/checkout@v4 From cb3c1e3e9e3da1fd631d6dfae4a3355687145a11 Mon Sep 17 00:00:00 2001 From: jClugstor Date: Tue, 10 Dec 2024 16:10:19 -0500 Subject: [PATCH 5/6] try this --- .github/workflows/Downstream.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/Downstream.yml b/.github/workflows/Downstream.yml index dd9322c39d..83669c4bd2 100644 --- a/.github/workflows/Downstream.yml +++ b/.github/workflows/Downstream.yml @@ -47,15 +47,6 @@ jobs: # Explicitly develop the libraries first before running the tests for now. # This is necessary since the tests are likely to fail otherwise, given that all # the libs haven't been registered yet. - - name: "Develop the libraries since they haven't been registered yet" - shell: julia --project=. {0} - run: | - import Pkg - Pkg.Registry.update() - # Install packages present in subdirectories - dev_pks = Pkg.PackageSpec[] - Pkg.develop(map(path -> Pkg.PackageSpec.(;path="lib/$(path)"), readdir("./lib"))); - Pkg.instantiate() - name: Clone Downstream uses: actions/checkout@v4 with: @@ -67,6 +58,7 @@ jobs: using Pkg try # force it to use this PR's version of the package + Pkg.develop(map(path ->Pkg.PackageSpec.(;path="$(@__DIR__)/lib/$(path)"), readdir("./lib"))); Pkg.develop(PackageSpec(path=".")) # resolver may fail with main deps Pkg.update() Pkg.test(coverage=true) # resolver may fail with test time deps From 41c5c16a0209f29f63d5c2b2c2f6cee7a7a354b4 Mon Sep 17 00:00:00 2001 From: jClugstor Date: Tue, 10 Dec 2024 16:44:35 -0500 Subject: [PATCH 6/6] lib --- .github/workflows/Downstream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Downstream.yml b/.github/workflows/Downstream.yml index 83669c4bd2..9ebbc15439 100644 --- a/.github/workflows/Downstream.yml +++ b/.github/workflows/Downstream.yml @@ -58,7 +58,7 @@ jobs: using Pkg try # force it to use this PR's version of the package - Pkg.develop(map(path ->Pkg.PackageSpec.(;path="$(@__DIR__)/lib/$(path)"), readdir("./lib"))); + Pkg.develop(map(path ->Pkg.PackageSpec.(;path="lib/$(path)"), readdir("./lib"))); Pkg.develop(PackageSpec(path=".")) # resolver may fail with main deps Pkg.update() Pkg.test(coverage=true) # resolver may fail with test time deps