From f88b4b4519a3028e85812b958c99082d90c4696c Mon Sep 17 00:00:00 2001 From: Julien Jerphanion Date: Thu, 17 Oct 2024 15:04:40 +0200 Subject: [PATCH] maint: Unpin libcurl<8.10 To see if 8.10.1 solved the problem. Signed-off-by: Julien Jerphanion --- .github/workflows/static_build.yml | 12 ------------ dev/environment-dev.yml | 2 +- dev/environment-micromamba-static.yml | 4 ++-- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/workflows/static_build.yml b/.github/workflows/static_build.yml index d2e1cac9f3..86039d1898 100644 --- a/.github/workflows/static_build.yml +++ b/.github/workflows/static_build.yml @@ -43,18 +43,6 @@ jobs: run: | cd micromamba-feedstock/ sed -i '' '/conda_forge_output_validation/d' conda-forge.yml - - name: Pin libcurl - if: ${{ matrix.platform == 'osx' }} - run: | - cd micromamba-feedstock/ - sed -i '' 's/libcurl >=8.4.0/libcurl >=8.4.0,<8.10/g' recipe/meta.yaml - sed -i '' 's/libcurl-static >=8.4.0/libcurl-static >=8.4.0,<8.10/g' recipe/meta.yaml - - name: Pin libcurl - if: ${{ matrix.platform == 'linux' }} - run: | - cd micromamba-feedstock/ - sed -i 's/libcurl >=8.4.0/libcurl >=8.4.0,<8.10/g' recipe/meta.yaml - sed -i 's/libcurl-static >=8.4.0/libcurl-static >=8.4.0,<8.10/g' recipe/meta.yaml - name: Checkout mamba branch uses: actions/checkout@v4 with: diff --git a/dev/environment-dev.yml b/dev/environment-dev.yml index ae90134024..f4827b683e 100644 --- a/dev/environment-dev.yml +++ b/dev/environment-dev.yml @@ -11,7 +11,7 @@ dependencies: - cpp-expected - fmt - libarchive - - libcurl >=7.86,<8.10 + - libcurl >=7.86 - libsodium - libsolv >=0.7.18 - nlohmann_json diff --git a/dev/environment-micromamba-static.yml b/dev/environment-micromamba-static.yml index 4cc7196e24..c404dd6186 100644 --- a/dev/environment-micromamba-static.yml +++ b/dev/environment-micromamba-static.yml @@ -17,8 +17,8 @@ dependencies: - yaml-cpp-static >=0.8.0 - reproc-static >=14.2.4.post0 - reproc-cpp-static >=14.2.4.post0 - - libcurl >=8.4.0,<8.10 - - libcurl-static >=8.4.0,<8.10 + - libcurl >=8.4.0 + - libcurl-static >=8.4.0 - xz-static - libssh2-static - libarchive-minimal-static