Ensure CI installs local wheels and update few wraps

Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
SciQLop · May 16, 2024 · 518385f · 518385f
1 parent 1e65d33
commit 518385f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -78,11 +78,11 @@ jobs:
       - name: install wheel (Unix)
         if: runner.os != 'Windows'
         run: |
-          pip install --find-links $GITHUB_WORKSPACE/dist pycdfpp
+          pip install --no-index --find-links $GITHUB_WORKSPACE/dist pycdfpp
       - name: install wheel (Windows)
         if: runner.os == 'Windows'
         run: |
-          pip install --find-links $env:GITHUB_WORKSPACE\dist pycdfpp
+          pip install --no-index --find-links $env:GITHUB_WORKSPACE\dist pycdfpp
       - uses: actions/checkout@v3
       - name: run tests
         run: |
@@ -111,7 +111,7 @@ jobs:
       - name: install wheel
         run: |
           pyenv local ${{ matrix.python-version }}
-          python3 -m pip install --break-system-packages --find-links $GITHUB_WORKSPACE/dist pycdfpp
+          python3 -m pip install --break-system-packages --no-index --find-links $GITHUB_WORKSPACE/dist pycdfpp
       - uses: actions/checkout@v3
       - name: run tests
         run: |

diff --git a/subprojects/catch2.wrap b/subprojects/catch2.wrap
@@ -1,10 +1,10 @@
 [wrap-file]
-directory = Catch2-3.5.3
-source_url = https://github.com/catchorg/Catch2/archive/v3.5.3.tar.gz
-source_filename = Catch2-3.5.3.tar.gz
-source_hash = 8d723b0535c94860ef8cf6231580fa47d67a3416757ecb10639e40d748ab6c71
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/catch2_3.5.3-1/Catch2-3.5.3.tar.gz
-wrapdb_version = 3.5.3-1
+directory = Catch2-3.5.4
+source_url = https://github.com/catchorg/Catch2/archive/v3.5.4.tar.gz
+source_filename = Catch2-3.5.4.tar.gz
+source_hash = b7754b711242c167d8f60b890695347f90a1ebc95949a045385114165d606dbb
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/catch2_3.5.4-1/Catch2-3.5.4.tar.gz
+wrapdb_version = 3.5.4-1
 
 [provide]
 catch2 = catch2_dep

diff --git a/subprojects/google-benchmark.wrap b/subprojects/google-benchmark.wrap
@@ -1,13 +1,14 @@
 [wrap-file]
-directory = benchmark-1.7.1
-source_url = https://github.com/google/benchmark/archive/refs/tags/v1.7.1.tar.gz
-source_filename = benchmark-1.7.1.tar.gz
-source_hash = 6430e4092653380d9dc4ccb45a1e2dc9259d581f4866dc0759713126056bc1d7
-patch_filename = google-benchmark_1.7.1-2_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/google-benchmark_1.7.1-2/get_patch
-patch_hash = 169304b7095ed39f2a260c84fe3fe368124a5a9ab66e529f11c71c9907fc4085
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/google-benchmark_1.7.1-2/benchmark-1.7.1.tar.gz
-wrapdb_version = 1.7.1-2
+directory = benchmark-1.8.3
+source_url = https://github.com/google/benchmark/archive/refs/tags/v1.8.3.tar.gz
+source_filename = benchmark-1.8.3.tar.gz
+source_hash = 6bc180a57d23d4d9515519f92b0c83d61b05b5bab188961f36ac7b06b0d9e9ce
+patch_filename = google-benchmark_1.8.3-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/google-benchmark_1.8.3-1/get_patch
+patch_hash = a7870d9a6deb4a3b7adfe60c8c44b94a5a67a09c4ad51c42b3e79ca41330da2f
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/google-benchmark_1.8.3-1/benchmark-1.8.3.tar.gz
+wrapdb_version = 1.8.3-1
 
 [provide]
 benchmark = google_benchmark_dep
+benchmark-main = google_benchmark_main_dep