From 3f0a7d5f85d894625d0b5a7fe0b464e4d215066b Mon Sep 17 00:00:00 2001 From: Julien Jerphanion Date: Thu, 17 Oct 2024 17:05:27 +0200 Subject: [PATCH 1/2] Unpin libcurl <8.10 See: https://github.com/mamba-org/mamba/pull/3548 Signed-off-by: Julien Jerphanion --- recipe/meta.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0d1db8b..c42e329 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,7 +13,7 @@ source: sha256: 90e31a0aabc2422685628b23720fdfd4dd5b50827258afeab5500effe250f799 build: - number: 0 + number: 1 outputs: - name: libmamba @@ -35,7 +35,7 @@ outputs: - python # [win] host: - libsolv >=0.7.23 - - libcurl >=8.4.0,<8.10 + - libcurl >=8.4.0 - openssl - libarchive - nlohmann_json @@ -50,7 +50,6 @@ outputs: - zstd - simdjson >=3.3.0 run: - - libcurl <8.10 # Missing run_export in libsolv - {{ pin_compatible('libsolv', max_pin='x.x.x') }} # Public libmamba dependencies From f052e4aedaa6b301c5932b332fa85437dc1ff507 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 15:11:08 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.42.2, and conda-forge-pinning 2024.10.17.13.07.12 --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- .ci_support/linux_64_.yaml | 5 ---- .ci_support/linux_aarch64_.yaml | 5 ---- .ci_support/linux_ppc64le_.yaml | 5 ---- .ci_support/osx_64_.yaml | 5 ---- .ci_support/osx_arm64_.yaml | 5 ---- .ci_support/win_64_.yaml | 5 ---- .scripts/build_steps.sh | 4 +-- .scripts/run_osx_build.sh | 4 +-- .scripts/run_win_build.bat | 4 +-- azure-pipelines.yml | 33 +++++++++++++++++++++--- 11 files changed, 36 insertions(+), 41 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 7708e23..ac0bf38 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-12 + vmImage: macOS-13 strategy: matrix: osx_64_: diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 2d31c92..d5cdbe4 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -6,10 +6,6 @@ cdt_name: - cos7 channel_sources: - conda-forge -- conda-forge -- conda-forge -- conda-forge/label/python_rc,conda-forge -- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -53,6 +49,5 @@ zip_keys: - cdt_name - - python - python_impl - - channel_sources zstd: - '1.5' diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index fb81250..2689313 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -10,10 +10,6 @@ cdt_name: - cos7 channel_sources: - conda-forge -- conda-forge -- conda-forge -- conda-forge/label/python_rc,conda-forge -- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -57,6 +53,5 @@ zip_keys: - cdt_name - - python - python_impl - - channel_sources zstd: - '1.5' diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 5c08979..d637ec9 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -6,10 +6,6 @@ cdt_name: - cos7 channel_sources: - conda-forge -- conda-forge -- conda-forge -- conda-forge/label/python_rc,conda-forge -- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -53,6 +49,5 @@ zip_keys: - cdt_name - - python - python_impl - - channel_sources zstd: - '1.5' diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index ff784f7..f9b0137 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -8,10 +8,6 @@ c_stdlib_version: - '10.13' channel_sources: - conda-forge -- conda-forge -- conda-forge -- conda-forge/label/python_rc,conda-forge -- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -53,6 +49,5 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources zstd: - '1.5' diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 444bb58..c534fec 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -8,10 +8,6 @@ c_stdlib_version: - '11.0' channel_sources: - conda-forge -- conda-forge -- conda-forge -- conda-forge/label/python_rc,conda-forge -- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -53,6 +49,5 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources zstd: - '1.5' diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 0563d36..fe846df 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -2,10 +2,6 @@ c_stdlib: - vs channel_sources: - conda-forge -- conda-forge -- conda-forge -- conda-forge/label/python_rc,conda-forge -- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -41,7 +37,6 @@ target_platform: zip_keys: - - python - python_impl - - channel_sources zlib: - '1' zstd: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 5ca92d7..91acda8 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -75,8 +75,8 @@ else --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Inspecting artifacts" ) 2> /dev/null - # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 - command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 420f051..dfef5ae 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -88,8 +88,8 @@ else ( startgroup "Inspecting artifacts" ) 2> /dev/null - # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 - command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir ./recipe -m ./.ci_support/${CONFIG}.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 1f3b2be..3ab271f 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -57,8 +57,8 @@ conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTR if !errorlevel! neq 0 exit /b !errorlevel! call :start_group "Inspecting artifacts" -:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 -WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts --recipe-dir ".\recipe" -m .ci_support\%CONFIG%.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" call :end_group :: Prepare some environment variables for the upload step diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e5306da..32da3d0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,7 +2,32 @@ # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- -jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file +stages: +- stage: Check + jobs: + - job: Skip + pool: + vmImage: 'ubuntu-22.04' + variables: + DECODE_PERCENTS: 'false' + RET: 'true' + steps: + - checkout: self + fetchDepth: '2' + - bash: | + git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "` + echo "##vso[task.setvariable variable=log]$git_log" + displayName: Obtain commit message + - bash: echo "##vso[task.setvariable variable=RET]false" + condition: or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]')) + displayName: Skip build? + - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" + name: result + displayName: Export result +- stage: Build + condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) + dependsOn: Check + jobs: + - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file