Skip to content

Commit ca64ba1

Browse files
authored
Merge branch 'main' into libmamba-splog
2 parents 3967b81 + f77d95f commit ca64ba1

File tree

3 files changed

+12
-16
lines changed

3 files changed

+12
-16
lines changed

.github/workflows/static_build.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,17 @@ jobs:
4545
run: |
4646
cd micromamba-feedstock/
4747
sed -i '' '/conda_forge_output_validation/d' conda-forge.yml
48+
- name: Replaces python 3.9 with 3.13
49+
if: ${{ matrix.platform == 'linux' }}
50+
run: |
51+
cd micromamba-feedstock/recipe/
52+
sed -i 's| - micromamba{{ bin_ext }} create -n test --override-channels -c conda-forge --yes python=3\.9| - micromamba{{ bin_ext }} create -n test --override-channels -c conda-forge --yes python=3.13|' meta.yaml
53+
- name: Uses libcurl 8.14
54+
if: ${{ matrix.platform == 'linux' }}
55+
run: |
56+
cd micromamba-feedstock/recipe/
57+
sed -i 's| - libcurl >=8\.4\.0[[:space:]]*# \[unix\]| - libcurl >=8.4,<8.15 #[unix]|' meta.yaml
58+
sed -i 's| - libcurl-static >=8\.4\.0[[:space:]]*# \[unix\]| - libcurl-static >=8.4,<8.15 #[unix]|' meta.yaml
4859
- name: Checkout mamba branch
4960
uses: actions/checkout@v4
5061
with:

libmamba/src/core/singletons.cpp

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,18 +88,10 @@ namespace mamba
8888
CURLsslset sslset_res;
8989
const curl_ssl_backend** available_backends;
9090

91-
if (util::on_linux)
91+
if (util::on_linux || util::on_mac)
9292
{
9393
sslset_res = curl_global_sslset(CURLSSLBACKEND_OPENSSL, nullptr, &available_backends);
9494
}
95-
else if (util::on_mac)
96-
{
97-
sslset_res = curl_global_sslset(
98-
CURLSSLBACKEND_SECURETRANSPORT,
99-
nullptr,
100-
&available_backends
101-
);
102-
}
10395
else if (util::on_win)
10496
{
10597
sslset_res = curl_global_sslset(CURLSSLBACKEND_SCHANNEL, nullptr, &available_backends);

libmamba/src/download/curl.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -281,13 +281,6 @@ namespace mamba::download
281281
{
282282
log = std::make_pair(std::string_view("Using OpenSSL backend"), CurlLogLevel::kInfo);
283283
}
284-
else if (info->backend == CURLSSLBACKEND_SECURETRANSPORT)
285-
{
286-
log = std::make_pair(
287-
std::string_view("Using macOS SecureTransport backend"),
288-
CurlLogLevel::kInfo
289-
);
290-
}
291284
else if (info->backend == CURLSSLBACKEND_SCHANNEL)
292285
{
293286
log = std::make_pair(

0 commit comments

Comments
 (0)