From 2bacb2cc25042beed76a5c611f553388a9042a5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Thu, 23 Jul 2026 18:17:51 +0200 Subject: [PATCH 1/2] Restore cross-dependency on libxcrypt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Accidentally dropped in 923b423aaaea2d2f03bcda17eed5219d0bfc8928. Signed-off-by: Michał Górny --- recipe/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 793e42196..ddf80c196 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -4,7 +4,7 @@ {% set ver2 = '.'.join(version.split('.')[0:2]) %} {% set ver2nd = ''.join(version.split('.')[0:2]) %} {% set ver3nd = ''.join(version.split('.')[0:3]) %} -{% set build_number = 0 %} +{% set build_number = 1 %} # this makes the linter happy {% set channel_targets = channel_targets or 'conda-forge main' %} @@ -174,6 +174,7 @@ outputs: - ncurses # [unix and build_platform != target_platform] - libffi # [build_platform != target_platform] - libuuid # [linux and build_platform != target_platform] + - libxcrypt # [linux and build_platform != target_platform] - libmpdec-devel # [build_platform != target_platform] - expat # [build_platform != target_platform] host: From ebc01bd594bbd049e5f08ac6288c592123d82930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Thu, 23 Jul 2026 18:18:45 +0200 Subject: [PATCH 2/2] MNT: Re-rendered with conda-smithy 2026.6.14 and conda-forge-pinning 2026.07.22.19.40.54 Other tools: - conda-build 26.5.0 - rattler-build 0.69.1 - rattler-build-conda-compat 1.4.15 --- .azure-pipelines/azure-pipelines-osx.yml | 60 ++++-- .azure-pipelines/azure-pipelines-win.yml | 39 ++-- ...nda-forge_python_debugfreethreadingno.yaml | 2 +- ...da-forge_python_debugfreethreadingyes.yaml | 2 +- ...argetsconda-forge_mainfreethreadingno.yaml | 2 +- ...rgetsconda-forge_mainfreethreadingyes.yaml | 2 +- ...nda-forge_python_debugfreethreadingno.yaml | 2 +- ...da-forge_python_debugfreethreadingyes.yaml | 2 +- ...argetsconda-forge_mainfreethreadingno.yaml | 2 +- ...rgetsconda-forge_mainfreethreadingyes.yaml | 2 +- ...nda-forge_python_debugfreethreadingno.yaml | 2 +- ...da-forge_python_debugfreethreadingyes.yaml | 2 +- ...argetsconda-forge_mainfreethreadingno.yaml | 2 +- ...rgetsconda-forge_mainfreethreadingyes.yaml | 2 +- .github/workflows/conda-build.yml | 198 +++++++++++------- .scripts/build_steps.sh | 27 ++- .scripts/create_conda_build_artifacts.bat | 9 +- .scripts/create_conda_build_artifacts.sh | 9 +- .scripts/run_docker_build.sh | 25 ++- build-locally.py | 5 +- 20 files changed, 253 insertions(+), 143 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index d1d3f47fe..3dcf9383d 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -13,80 +13,104 @@ jobs: UPLOAD_PACKAGES: 'True' VMIMAGE: macOS-15 build_workspace_dir: ~/miniforge3/conda-bld + free_disk_space: skip + pagefile_size: 0 + resize_partitions: false store_build_artifacts: true tools_install_dir: ~/miniforge3 - SHORT_CONFIG: osx_64_build_typedebugchannel_targetscon_h5e478946 + CONFIG_SHORT: osx_64_build_typedebugchannel_targetscon_h5e478946 osx_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes: CONFIG: osx_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes UPLOAD_PACKAGES: 'True' VMIMAGE: macOS-15 build_workspace_dir: ~/miniforge3/conda-bld + free_disk_space: skip + pagefile_size: 0 + resize_partitions: false store_build_artifacts: true tools_install_dir: ~/miniforge3 - SHORT_CONFIG: osx_64_build_typedebugchannel_targetscon_h116d3356 + CONFIG_SHORT: osx_64_build_typedebugchannel_targetscon_h116d3356 osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno: CONFIG: osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno UPLOAD_PACKAGES: 'True' VMIMAGE: macOS-15 build_workspace_dir: ~/miniforge3/conda-bld + free_disk_space: skip + pagefile_size: 0 + resize_partitions: false store_build_artifacts: true tools_install_dir: ~/miniforge3 - SHORT_CONFIG: osx_64_build_typereleasechannel_targetsc_h425d4db0 + CONFIG_SHORT: osx_64_build_typereleasechannel_targetsc_h425d4db0 osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes: CONFIG: osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes UPLOAD_PACKAGES: 'True' VMIMAGE: macOS-15 build_workspace_dir: ~/miniforge3/conda-bld + free_disk_space: skip + pagefile_size: 0 + resize_partitions: false store_build_artifacts: true tools_install_dir: ~/miniforge3 - SHORT_CONFIG: osx_64_build_typereleasechannel_targetsc_haa8f77b8 + CONFIG_SHORT: osx_64_build_typereleasechannel_targetsc_haa8f77b8 osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno: CONFIG: osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno UPLOAD_PACKAGES: 'True' VMIMAGE: macOS-15-arm64 build_workspace_dir: ~/miniforge3/conda-bld + free_disk_space: skip + pagefile_size: 0 + resize_partitions: false store_build_artifacts: true tools_install_dir: ~/miniforge3 - SHORT_CONFIG: osx_arm64_build_typedebugchannel_targets_h4a1f0d05 + CONFIG_SHORT: osx_arm64_build_typedebugchannel_targets_h4a1f0d05 osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes: CONFIG: osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes UPLOAD_PACKAGES: 'True' VMIMAGE: macOS-15-arm64 build_workspace_dir: ~/miniforge3/conda-bld + free_disk_space: skip + pagefile_size: 0 + resize_partitions: false store_build_artifacts: true tools_install_dir: ~/miniforge3 - SHORT_CONFIG: osx_arm64_build_typedebugchannel_targets_h49dbe0c1 + CONFIG_SHORT: osx_arm64_build_typedebugchannel_targets_h49dbe0c1 osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno: CONFIG: osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno UPLOAD_PACKAGES: 'True' VMIMAGE: macOS-15-arm64 build_workspace_dir: ~/miniforge3/conda-bld + free_disk_space: skip + pagefile_size: 0 + resize_partitions: false store_build_artifacts: true tools_install_dir: ~/miniforge3 - SHORT_CONFIG: osx_arm64_build_typereleasechannel_targe_h0d9a29af + CONFIG_SHORT: osx_arm64_build_typereleasechannel_targe_h0d9a29af osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes: CONFIG: osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes UPLOAD_PACKAGES: 'True' VMIMAGE: macOS-15-arm64 build_workspace_dir: ~/miniforge3/conda-bld + free_disk_space: skip + pagefile_size: 0 + resize_partitions: false store_build_artifacts: true tools_install_dir: ~/miniforge3 - SHORT_CONFIG: osx_arm64_build_typereleasechannel_targe_h92a1d5a6 + CONFIG_SHORT: osx_arm64_build_typereleasechannel_targe_h92a1d5a6 timeoutInMinutes: 360 variables: {} steps: # TODO: Fast finish on azure pipelines? - script: | - export MINIFORGE_HOME=$(tools_install_dir) - export CONDA_BLD_PATH=$(build_workspace_dir) export CI=azure + export CONDA_BLD_PATH=$(build_workspace_dir) + export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME + export MINIFORGE_HOME=$(tools_install_dir) + export OSX_FORCE_SDK_DOWNLOAD="1" export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) export remote_url=$(Build.Repository.Uri) export sha=$(Build.SourceVersion) - export OSX_FORCE_SDK_DOWNLOAD="1" - export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME - export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then export IS_PR_BUILD="True" else @@ -100,14 +124,14 @@ jobs: STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - script: | - export MINIFORGE_HOME=$(tools_install_dir) - export CONDA_BLD_PATH=$(build_workspace_dir) - export CI=azure - export CI_RUN_ID=$(build.BuildNumber).$(system.JobAttempt) - export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) export ARTIFACT_STAGING_DIR="$(Build.ArtifactStagingDirectory)" # Archive everything in CONDA_BLD_PATH except environments export BLD_ARTIFACT_PREFIX=conda_artifacts + export CI=azure + export CI_RUN_ID=$(build.BuildNumber).$(system.JobAttempt) + export CONDA_BLD_PATH=$(build_workspace_dir) + export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + export MINIFORGE_HOME=$(tools_install_dir) if [[ "$AGENT_JOBSTATUS" == "Failed" ]]; then # Archive the CONDA_BLD_PATH environments only when the job fails export ENV_ARTIFACT_PREFIX=conda_envs diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index e71423534..9c460bb69 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -12,62 +12,73 @@ jobs: CONFIG: win_64_freethreadingno UPLOAD_PACKAGES: 'True' build_workspace_dir: D:\\bld\\ + free_disk_space: skip + pagefile_size: 0 + resize_partitions: false store_build_artifacts: true tools_install_dir: D:\Miniforge - SHORT_CONFIG: win_64_freethreadingno + CONFIG_SHORT: win_64_freethreadingno win_64_freethreadingyes: CONFIG: win_64_freethreadingyes UPLOAD_PACKAGES: 'True' build_workspace_dir: D:\\bld\\ + free_disk_space: skip + pagefile_size: 0 + resize_partitions: false store_build_artifacts: true tools_install_dir: D:\Miniforge - SHORT_CONFIG: win_64_freethreadingyes + CONFIG_SHORT: win_64_freethreadingyes win_arm64_freethreadingno: CONFIG: win_arm64_freethreadingno UPLOAD_PACKAGES: 'True' build_workspace_dir: C:\\bld\\ + free_disk_space: skip + pagefile_size: 0 + resize_partitions: false store_build_artifacts: true tools_install_dir: C:\Miniforge - SHORT_CONFIG: win_arm64_freethreadingno + CONFIG_SHORT: win_arm64_freethreadingno win_arm64_freethreadingyes: CONFIG: win_arm64_freethreadingyes UPLOAD_PACKAGES: 'True' build_workspace_dir: C:\\bld\\ + free_disk_space: skip + pagefile_size: 0 + resize_partitions: false store_build_artifacts: true tools_install_dir: C:\Miniforge - SHORT_CONFIG: win_arm64_freethreadingyes + CONFIG_SHORT: win_arm64_freethreadingyes timeoutInMinutes: 360 variables: UPLOAD_TEMP: D:\\tmp steps: - - script: | call ".scripts\run_win_build.bat" displayName: Run Windows build env: - MINIFORGE_HOME: $(tools_install_dir) + CI: azure + CONFIG: $(CONFIG) CONDA_BLD_PATH: $(build_workspace_dir) + MINIFORGE_HOME: $(tools_install_dir) PYTHONUNBUFFERED: 1 - CONFIG: $(CONFIG) - CI: azure + UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) + UPLOAD_TEMP: $(UPLOAD_TEMP) flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) remote_url: $(Build.Repository.Uri) sha: $(Build.SourceVersion) - UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) - UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - script: | - set MINIFORGE_HOME=$(tools_install_dir) - set CONDA_BLD_PATH=$(build_workspace_dir) + set ARTIFACT_STAGING_DIR=$(Build.ArtifactStagingDirectory + set BLD_ARTIFACT_PREFIX=conda_artifacts set CI=azure set CI_RUN_ID=$(build.BuildNumber).$(system.JobAttempt) + set CONDA_BLD_PATH=$(build_workspace_dir) set FEEDSTOCK_NAME=$(build.Repository.Name) - set ARTIFACT_STAGING_DIR=$(Build.ArtifactStagingDirectory) - set BLD_ARTIFACT_PREFIX=conda_artifacts + set MINIFORGE_HOME=$(tools_install_dir) if "%AGENT_JOBSTATUS%" == "Failed" ( set ENV_ARTIFACT_PREFIX=conda_envs ) diff --git a/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml index 37593b055..1842dedeb 100644 --- a/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml +++ b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml @@ -19,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '14' docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 +- quay.io/condaforge/linux-anvil-x86_64:alma10 expat: - '2' freethreading: diff --git a/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml index b1b3ad18a..1bc4551d5 100644 --- a/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml +++ b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml @@ -19,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '14' docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 +- quay.io/condaforge/linux-anvil-x86_64:alma10 expat: - '2' freethreading: diff --git a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml index df48c0233..2c765546b 100644 --- a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -19,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '14' docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 +- quay.io/condaforge/linux-anvil-x86_64:alma10 expat: - '2' freethreading: diff --git a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml index e610789ca..4635edc72 100644 --- a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -19,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '14' docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 +- quay.io/condaforge/linux-anvil-x86_64:alma10 expat: - '2' freethreading: diff --git a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml index a926bb763..effc858c0 100644 --- a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml +++ b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml @@ -19,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '14' docker_image: -- quay.io/condaforge/linux-anvil-aarch64:alma9 +- quay.io/condaforge/linux-anvil-aarch64:alma10 expat: - '2' freethreading: diff --git a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml index e326b66ba..ad1fd1cde 100644 --- a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml +++ b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml @@ -19,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '14' docker_image: -- quay.io/condaforge/linux-anvil-aarch64:alma9 +- quay.io/condaforge/linux-anvil-aarch64:alma10 expat: - '2' freethreading: diff --git a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml index 706f1686d..59fb1d653 100644 --- a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -19,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '14' docker_image: -- quay.io/condaforge/linux-anvil-aarch64:alma9 +- quay.io/condaforge/linux-anvil-aarch64:alma10 expat: - '2' freethreading: diff --git a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml index 6fea00316..8bac0b18c 100644 --- a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -19,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '14' docker_image: -- quay.io/condaforge/linux-anvil-aarch64:alma9 +- quay.io/condaforge/linux-anvil-aarch64:alma10 expat: - '2' freethreading: diff --git a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml index 1aab323bc..9827cc1c7 100644 --- a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml +++ b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml @@ -19,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '14' docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 +- quay.io/condaforge/linux-anvil-x86_64:alma10 expat: - '2' freethreading: diff --git a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml index 874f4a813..fbf961159 100644 --- a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml +++ b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml @@ -19,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '14' docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 +- quay.io/condaforge/linux-anvil-x86_64:alma10 expat: - '2' freethreading: diff --git a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml index fae135ea5..47831acbe 100644 --- a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -19,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '14' docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 +- quay.io/condaforge/linux-anvil-x86_64:alma10 expat: - '2' freethreading: diff --git a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml index 70dcd3114..dd883ff2f 100644 --- a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -19,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '14' docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 +- quay.io/condaforge/linux-anvil-x86_64:alma10 expat: - '2' freethreading: diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index a09c673a7..1f783e598 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -23,191 +23,233 @@ jobs: matrix: include: - CONFIG: linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno + CONFIG_SHORT: linux_64_build_typedebugchannel_targetsc_h10d856d4 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10 STORE_BUILD_ARTIFACTS: True - SHORT_CONFIG: linux_64_build_typedebugchannel_targetsc_h10d856d4 UPLOAD_PACKAGES: True + build_workspace_dir: build_artifacts + docker_run_args: + free_disk_space: skip os: ubuntu + pagefile_size: 0 + resize_partitions: False runs_on: ['ubuntu-latest'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 tools_install_dir: ~/miniforge3 - build_workspace_dir: build_artifacts - docker_run_args: - CONFIG: linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes + CONFIG_SHORT: linux_64_build_typedebugchannel_targetsc_hf83d9e2d + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10 STORE_BUILD_ARTIFACTS: True - SHORT_CONFIG: linux_64_build_typedebugchannel_targetsc_hf83d9e2d UPLOAD_PACKAGES: True + build_workspace_dir: build_artifacts + docker_run_args: + free_disk_space: skip os: ubuntu + pagefile_size: 0 + resize_partitions: False runs_on: ['ubuntu-latest'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 tools_install_dir: ~/miniforge3 - build_workspace_dir: build_artifacts - docker_run_args: - CONFIG: linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno + CONFIG_SHORT: linux_64_build_typereleasechannel_target_h01f3c156 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10 STORE_BUILD_ARTIFACTS: True - SHORT_CONFIG: linux_64_build_typereleasechannel_target_h01f3c156 UPLOAD_PACKAGES: True + build_workspace_dir: build_artifacts + docker_run_args: + free_disk_space: skip os: ubuntu + pagefile_size: 0 + resize_partitions: False runs_on: ['ubuntu-latest'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 tools_install_dir: ~/miniforge3 - build_workspace_dir: build_artifacts - docker_run_args: - CONFIG: linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes + CONFIG_SHORT: linux_64_build_typereleasechannel_target_hf5ff4d16 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10 STORE_BUILD_ARTIFACTS: True - SHORT_CONFIG: linux_64_build_typereleasechannel_target_hf5ff4d16 UPLOAD_PACKAGES: True + build_workspace_dir: build_artifacts + docker_run_args: + free_disk_space: skip os: ubuntu + pagefile_size: 0 + resize_partitions: False runs_on: ['ubuntu-latest'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 tools_install_dir: ~/miniforge3 - build_workspace_dir: build_artifacts - docker_run_args: - CONFIG: linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno + CONFIG_SHORT: linux_aarch64_build_typedebugchannel_tar_hd2db0a21 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64:alma10 STORE_BUILD_ARTIFACTS: True - SHORT_CONFIG: linux_aarch64_build_typedebugchannel_tar_hd2db0a21 UPLOAD_PACKAGES: True + build_workspace_dir: build_artifacts + docker_run_args: + free_disk_space: skip os: ubuntu + pagefile_size: 0 + resize_partitions: False runs_on: ['ubuntu-24.04-arm'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64:alma9 tools_install_dir: ~/miniforge3 - build_workspace_dir: build_artifacts - docker_run_args: - CONFIG: linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes + CONFIG_SHORT: linux_aarch64_build_typedebugchannel_tar_h51de9693 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64:alma10 STORE_BUILD_ARTIFACTS: True - SHORT_CONFIG: linux_aarch64_build_typedebugchannel_tar_h51de9693 UPLOAD_PACKAGES: True + build_workspace_dir: build_artifacts + docker_run_args: + free_disk_space: skip os: ubuntu + pagefile_size: 0 + resize_partitions: False runs_on: ['ubuntu-24.04-arm'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64:alma9 tools_install_dir: ~/miniforge3 - build_workspace_dir: build_artifacts - docker_run_args: - CONFIG: linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno + CONFIG_SHORT: linux_aarch64_build_typereleasechannel_t_hccc48f4a + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64:alma10 STORE_BUILD_ARTIFACTS: True - SHORT_CONFIG: linux_aarch64_build_typereleasechannel_t_hccc48f4a UPLOAD_PACKAGES: True + build_workspace_dir: build_artifacts + docker_run_args: + free_disk_space: skip os: ubuntu + pagefile_size: 0 + resize_partitions: False runs_on: ['ubuntu-24.04-arm'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64:alma9 tools_install_dir: ~/miniforge3 - build_workspace_dir: build_artifacts - docker_run_args: - CONFIG: linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes + CONFIG_SHORT: linux_aarch64_build_typereleasechannel_t_h78d2c7f5 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64:alma10 STORE_BUILD_ARTIFACTS: True - SHORT_CONFIG: linux_aarch64_build_typereleasechannel_t_h78d2c7f5 UPLOAD_PACKAGES: True + build_workspace_dir: build_artifacts + docker_run_args: + free_disk_space: skip os: ubuntu + pagefile_size: 0 + resize_partitions: False runs_on: ['ubuntu-24.04-arm'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64:alma9 tools_install_dir: ~/miniforge3 - build_workspace_dir: build_artifacts - docker_run_args: - CONFIG: linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno + CONFIG_SHORT: linux_ppc64le_build_typedebugchannel_tar_hac8bb296 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10 STORE_BUILD_ARTIFACTS: True - SHORT_CONFIG: linux_ppc64le_build_typedebugchannel_tar_hac8bb296 UPLOAD_PACKAGES: True + build_workspace_dir: build_artifacts + docker_run_args: + free_disk_space: skip os: ubuntu + pagefile_size: 0 + resize_partitions: False runs_on: ['ubuntu-latest'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 tools_install_dir: ~/miniforge3 - build_workspace_dir: build_artifacts - docker_run_args: - CONFIG: linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes + CONFIG_SHORT: linux_ppc64le_build_typedebugchannel_tar_hb74ed675 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10 STORE_BUILD_ARTIFACTS: True - SHORT_CONFIG: linux_ppc64le_build_typedebugchannel_tar_hb74ed675 UPLOAD_PACKAGES: True + build_workspace_dir: build_artifacts + docker_run_args: + free_disk_space: skip os: ubuntu + pagefile_size: 0 + resize_partitions: False runs_on: ['ubuntu-latest'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 tools_install_dir: ~/miniforge3 - build_workspace_dir: build_artifacts - docker_run_args: - CONFIG: linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingno + CONFIG_SHORT: linux_ppc64le_build_typereleasechannel_t_h5454d1d5 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10 STORE_BUILD_ARTIFACTS: True - SHORT_CONFIG: linux_ppc64le_build_typereleasechannel_t_h5454d1d5 UPLOAD_PACKAGES: True + build_workspace_dir: build_artifacts + docker_run_args: + free_disk_space: skip os: ubuntu + pagefile_size: 0 + resize_partitions: False runs_on: ['ubuntu-latest'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 tools_install_dir: ~/miniforge3 - build_workspace_dir: build_artifacts - docker_run_args: - CONFIG: linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes + CONFIG_SHORT: linux_ppc64le_build_typereleasechannel_t_hed84b2c3 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10 STORE_BUILD_ARTIFACTS: True - SHORT_CONFIG: linux_ppc64le_build_typereleasechannel_t_hed84b2c3 UPLOAD_PACKAGES: True + build_workspace_dir: build_artifacts + docker_run_args: + free_disk_space: skip os: ubuntu + pagefile_size: 0 + resize_partitions: False runs_on: ['ubuntu-latest'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 tools_install_dir: ~/miniforge3 - build_workspace_dir: build_artifacts - docker_run_args: steps: - name: Checkout code uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - name: Configure binfmt_misc + if: matrix.os == 'ubuntu' + shell: bash + run: | + if [[ "$(uname -m)" == "x86_64" ]]; then + docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes + fi - name: Build on Linux id: build-linux if: matrix.os == 'ubuntu' env: - MINIFORGE_HOME: ${{ matrix.tools_install_dir }} + CI: github_actions CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }} + CONDA_FORGE_DOCKER_RUN_ARGS: ${{ matrix.docker_run_args }} CONFIG: ${{ matrix.CONFIG }} - UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }} + MINIFORGE_HOME: ${{ matrix.tools_install_dir }} DOCKER_IMAGE: ${{ matrix.DOCKER_IMAGE }} - CI: github_actions - CONDA_FORGE_DOCKER_RUN_ARGS: "${{ matrix.docker_run_args }}" + UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }} + RATTLER_BUILD_COLOR: always + RATTLER_BUILD_ENABLE_GITHUB_INTEGRATION: 'true' BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }} FEEDSTOCK_TOKEN: ${{ secrets.FEEDSTOCK_TOKEN }} STAGING_BINSTAR_TOKEN: ${{ secrets.STAGING_BINSTAR_TOKEN }} shell: bash run: | - if [[ "$(uname -m)" == "x86_64" ]]; then - echo "::group::Configure binfmt_misc" - docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes - fi + export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}" + export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)" + export GIT_BRANCH="$(basename $GITHUB_REF)" + export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}" export flow_run_id="github_$GITHUB_RUN_ID" export remote_url="https://github.com/$GITHUB_REPOSITORY" export sha="$GITHUB_SHA" - export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)" - export GIT_BRANCH="$(basename $GITHUB_REF)" if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]; then export IS_PR_BUILD="True" else export IS_PR_BUILD="False" fi - export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}" - export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}" - echo "::endgroup::" ./.scripts/run_docker_build.sh - name: Build on macOS id: build-macos if: matrix.os == 'macos' env: - MINIFORGE_HOME: ${{ matrix.tools_install_dir }} + CI: github_actions CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }} CONFIG: ${{ matrix.CONFIG }} + MINIFORGE_HOME: ${{ matrix.tools_install_dir }} UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }} - CI: github_actions + RATTLER_BUILD_COLOR: always + RATTLER_BUILD_ENABLE_GITHUB_INTEGRATION: 'true' BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }} FEEDSTOCK_TOKEN: ${{ secrets.FEEDSTOCK_TOKEN }} STAGING_BINSTAR_TOKEN: ${{ secrets.STAGING_BINSTAR_TOKEN }} shell: bash run: | + export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}" + export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)" + export GIT_BRANCH="$(basename $GITHUB_REF)" + export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}" export flow_run_id="github_$GITHUB_RUN_ID" export remote_url="https://github.com/$GITHUB_REPOSITORY" export sha="$GITHUB_SHA" - export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)" - export GIT_BRANCH="$(basename $GITHUB_REF)" if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]; then export IS_PR_BUILD="True" else export IS_PR_BUILD="False" fi - export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}" - export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}" ./.scripts/run_osx_build.sh - name: Build on windows @@ -220,12 +262,14 @@ jobs: set "sha=%GITHUB_SHA%" call ".scripts\run_win_build.bat" env: - MINIFORGE_HOME: ${{ matrix.tools_install_dir }} + CI: github_actions CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }} - PYTHONUNBUFFERED: 1 CONFIG: ${{ matrix.CONFIG }} - CI: github_actions + MINIFORGE_HOME: ${{ matrix.tools_install_dir }} + PYTHONUNBUFFERED: 1 UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }} + RATTLER_BUILD_COLOR: always + RATTLER_BUILD_ENABLE_GITHUB_INTEGRATION: 'true' BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }} FEEDSTOCK_TOKEN: ${{ secrets.FEEDSTOCK_TOKEN }} STAGING_BINSTAR_TOKEN: ${{ secrets.STAGING_BINSTAR_TOKEN }} @@ -259,18 +303,18 @@ jobs: # we do not want to trigger artefact creation if the build was cancelled if: ${{ always() && steps.determine-status.outputs.status != 'cancelled' && matrix.STORE_BUILD_ARTIFACTS }} env: - CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }} CI: github_actions + CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }} CONFIG: ${{ matrix.CONFIG }} - SHORT_CONFIG: ${{ matrix.SHORT_CONFIG }} + CONFIG_SHORT: ${{ matrix.CONFIG_SHORT }} JOB_STATUS: ${{ steps.determine-status.outputs.status }} OS: ${{ matrix.os }} run: | - export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}" - export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}" + export ARTIFACT_STAGING_DIR="$GITHUB_WORKSPACE" export CI_RUN_ID=$GITHUB_RUN_ID + export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}" export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)" - export ARTIFACT_STAGING_DIR="$GITHUB_WORKSPACE" + export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}" # Archive everything in CONDA_BLD_PATH except environments # Archive the CONDA_BLD_PATH environments only when the job fails # Use different prefix for successful and failed build artifacts @@ -288,7 +332,7 @@ jobs: fi - name: Store conda build artifacts - uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0 + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 if: ${{ always() && steps.prepare-artifacts.outcome == 'success' }} with: name: ${{ steps.prepare-artifacts.outputs.BLD_ARTIFACT_NAME }} @@ -297,7 +341,7 @@ jobs: continue-on-error: true - name: Store conda build environment artifacts - uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0 + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 # only relevant if build failed, see above if: ${{ always() && steps.determine-status.outputs.status == 'failure' && steps.prepare-artifacts.outcome == 'success' }} with: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index c83e212f4..5c97f7442 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -61,18 +61,33 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then fi if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then - if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" - fi - conda debug "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + # differences between conda-build vs. rattler-build + # - 1 step (conda debug + manually open shell) vs. 2 step (rb debug {setup, shell}) + # - recipe is positional vs. --recipe "${RECIPE_ROOT}" + # - --output-id vs. --output-name + # - --clobber-file vs. none + # - none vs. --target-platform + conda debug \ + "${RECIPE_ROOT}" \ + -m "${CI_SUPPORT}/${CONFIG}.yaml" \ ${EXTRA_CB_OPTIONS:-} \ + ${BUILD_OUTPUT_ID:+--output-id "${BUILD_OUTPUT_ID}"} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" # Drop into an interactive shell /bin/bash else - conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ - --suppress-variables ${EXTRA_CB_OPTIONS:-} \ + # differences between conda-build vs. rattler-build + # - recipe is positional vs. --recipe "${RECIPE_ROOT}" + # - --suppress-variables vs. none + # - --clobber-file vs. none + # - none vs. --target-platform + # - --extra-meta a=b c=d vs. --extra-meta a=b --extra-meta c=d + conda-build \ + "${RECIPE_ROOT}" \ + -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + ${EXTRA_CB_OPTIONS:-} \ + --suppress-variables \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Inspecting artifacts" ) 2> /dev/null diff --git a/.scripts/create_conda_build_artifacts.bat b/.scripts/create_conda_build_artifacts.bat index 6120712cc..705dc461b 100755 --- a/.scripts/create_conda_build_artifacts.bat +++ b/.scripts/create_conda_build_artifacts.bat @@ -4,10 +4,11 @@ rem INPUTS (environment variables that need to be set before calling this script rem rem CI (azure/github_actions/UNSET) rem CI_RUN_ID (unique identifier for the CI job run) -rem FEEDSTOCK_NAME -rem CONFIG (build matrix configuration string) -rem SHORT_CONFIG (uniquely-shortened configuration string) rem CONDA_BLD_PATH (path to the conda-bld directory) +rem CONFIG (build matrix configuration string) +rem CONFIG_SHORT (uniquely-shortened configuration string) +rem FEEDSTOCK_NAME +rem Optional: rem ARTIFACT_STAGING_DIR (use working directory if unset) rem BLD_ARTIFACT_PREFIX (prefix for the conda build artifact name, skip if unset) rem ENV_ARTIFACT_PREFIX (prefix for the conda build environments artifact name, skip if unset) @@ -33,7 +34,7 @@ if not defined ARTIFACT_STAGING_DIR ( rem Set a unique ID for the artifact(s), specialized for this particular job run set ARTIFACT_UNIQUE_ID=%CI_RUN_ID%_%CONFIG% if not "%ARTIFACT_UNIQUE_ID%" == "%ARTIFACT_UNIQUE_ID:~0,80%" ( - set ARTIFACT_UNIQUE_ID=%CI_RUN_ID%_%SHORT_CONFIG% + set ARTIFACT_UNIQUE_ID=%CI_RUN_ID%_%CONFIG_SHORT% ) rem Make the build artifact zip diff --git a/.scripts/create_conda_build_artifacts.sh b/.scripts/create_conda_build_artifacts.sh index 1e3acc78a..91095c05d 100755 --- a/.scripts/create_conda_build_artifacts.sh +++ b/.scripts/create_conda_build_artifacts.sh @@ -4,10 +4,11 @@ # # CI (azure/github_actions/UNSET) # CI_RUN_ID (unique identifier for the CI job run) -# FEEDSTOCK_NAME -# CONFIG (build matrix configuration string) -# SHORT_CONFIG (uniquely-shortened configuration string) # CONDA_BLD_PATH (path to the conda-bld directory) +# CONFIG (build matrix configuration string) +# CONFIG_SHORT (uniquely-shortened configuration string) +# FEEDSTOCK_NAME +# Optional: # ARTIFACT_STAGING_DIR (use working directory if unset) # BLD_ARTIFACT_PREFIX (prefix for the conda build artifact name, skip if unset) # ENV_ARTIFACT_PREFIX (prefix for the conda build environments artifact name, skip if unset) @@ -49,7 +50,7 @@ fi # Set a unique ID for the artifact(s), specialized for this particular job run ARTIFACT_UNIQUE_ID="${CI_RUN_ID}_${CONFIG}" if [[ ${#ARTIFACT_UNIQUE_ID} -gt 80 ]]; then - ARTIFACT_UNIQUE_ID="${CI_RUN_ID}_${SHORT_CONFIG}" + ARTIFACT_UNIQUE_ID="${CI_RUN_ID}_${CONFIG_SHORT}" fi echo "ARTIFACT_UNIQUE_ID: $ARTIFACT_UNIQUE_ID" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 10d6a2af9..17d983f11 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -96,6 +96,14 @@ if [ "${DOCKER_EXECUTABLE}" = "podman" ]; then fi fi +# When running on GitHub Actions, mount the step summary file into the container +# and point GITHUB_STEP_SUMMARY at it so that rattler-build's GitHub integration +# can write its summary. GitHub writes the file out to the job summary after the +# step finishes. +if [[ -n "${GITHUB_STEP_SUMMARY:-}" ]]; then + DOCKER_RUN_ARGS="${DOCKER_RUN_ARGS} -v ${GITHUB_STEP_SUMMARY}:/home/conda/github_step_summary:rw${VOLUME_SUFFIX},delegated -e GITHUB_STEP_SUMMARY=/home/conda/github_step_summary" +fi + ( endgroup "Configure Docker" ) 2> /dev/null ( startgroup "Start Docker" ) 2> /dev/null @@ -107,17 +115,20 @@ ${DOCKER_EXECUTABLE} pull "${DOCKER_IMAGE}" ${DOCKER_EXECUTABLE} run ${DOCKER_RUN_ARGS} \ -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw${VOLUME_SUFFIX},delegated \ -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw${VOLUME_SUFFIX},delegated \ + -e BUILD_OUTPUT_ID \ + -e BUILD_WITH_CONDA_DEBUG \ + -e CI \ -e CONFIG \ + -e CPU_COUNT \ + -e FEEDSTOCK_NAME \ + -e GIT_BRANCH \ + -e GITHUB_ACTIONS \ -e HOST_USER_ID \ - -e UPLOAD_PACKAGES \ -e IS_PR_BUILD \ - -e GIT_BRANCH \ + -e RATTLER_BUILD_COLOR \ + -e RATTLER_BUILD_ENABLE_GITHUB_INTEGRATION \ -e UPLOAD_ON_BRANCH \ - -e CI \ - -e FEEDSTOCK_NAME \ - -e CPU_COUNT \ - -e BUILD_WITH_CONDA_DEBUG \ - -e BUILD_OUTPUT_ID \ + -e UPLOAD_PACKAGES \ -e flow_run_id \ -e remote_url \ -e sha \ diff --git a/build-locally.py b/build-locally.py index 05493e4d8..3beb68ccd 100755 --- a/build-locally.py +++ b/build-locally.py @@ -98,7 +98,10 @@ def main(args=None): p.add_argument( "--debug", action="store_true", - help="Setup debug environment using `conda debug`", + help=( + "Setup debug environment using `conda debug` " + "(or `rattler-build debug` for rattler-build recipes)" + ), ) p.add_argument("--output-id", help="If running debug, specify the output to setup.")