From 66ec2ee706dd70ea5e6f9595ba022f355f7e9ca3 Mon Sep 17 00:00:00 2001 From: akrherz Date: Thu, 26 Dec 2024 15:58:21 -0600 Subject: [PATCH 1/5] build 1.19.5 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e266c1c..5e199dd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set build = 0 %} {% set name = "libheif" %} -{% set version = "1.18.2" %} +{% set version = "1.19.5" %} {%- if license_family == 'gpl' %} {%- set build = build + 100 %} @@ -12,7 +12,7 @@ package: source: url: https://github.com/strukturag/libheif/releases/download/v{{ version }}/libheif-{{ version }}.tar.gz - sha256: c4002a622bec9f519f29d84bfdc6024e33fd67953a5fb4dc2c2f11f67d5e45bf + sha256: d3cf0a76076115a070f9bc87cf5259b333a1f05806500045338798486d0afbaf build: number: {{ build }} From 41bae0ed59689cc8126321dcf48a1e6e5fc64d05 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 26 Dec 2024 22:02:01 +0000 Subject: [PATCH 2/5] MNT: Re-rendered with conda-build 24.11.2, conda-smithy 3.45.1, and conda-forge-pinning 2024.12.26.18.39.45 --- .azure-pipelines/azure-pipelines-linux.yml | 12 ++--- .azure-pipelines/azure-pipelines-osx.yml | 2 +- .azure-pipelines/azure-pipelines-win.yml | 20 ++------ .ci_support/linux_64_license_familygpl.yaml | 9 ++-- .ci_support/linux_64_license_familylgpl.yaml | 9 ++-- .../linux_aarch64_license_familygpl.yaml | 13 ++--- .../linux_aarch64_license_familylgpl.yaml | 13 ++--- .../linux_ppc64le_license_familygpl.yaml | 9 ++-- .../linux_ppc64le_license_familylgpl.yaml | 9 ++-- .ci_support/osx_64_license_familygpl.yaml | 2 +- .ci_support/osx_64_license_familylgpl.yaml | 2 +- .ci_support/osx_arm64_license_familygpl.yaml | 2 +- .ci_support/osx_arm64_license_familylgpl.yaml | 2 +- .scripts/build_steps.sh | 16 +++--- .scripts/run_osx_build.sh | 50 ++++++++++++------- .scripts/run_win_build.bat | 43 ++++++++++++---- azure-pipelines.yml | 33 ++++++++++-- build-locally.py | 12 ++++- 18 files changed, 144 insertions(+), 114 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 4d034d1..da01d3f 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -11,27 +11,27 @@ jobs: linux_64_license_familygpl: CONFIG: linux_64_license_familygpl UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 linux_64_license_familylgpl: CONFIG: linux_64_license_familylgpl UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 linux_aarch64_license_familygpl: CONFIG: linux_aarch64_license_familygpl UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 linux_aarch64_license_familylgpl: CONFIG: linux_aarch64_license_familylgpl UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 linux_ppc64le_license_familygpl: CONFIG: linux_ppc64le_license_familygpl UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 linux_ppc64le_license_familylgpl: CONFIG: linux_ppc64le_license_familylgpl UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 933e91c..4f4a8c2 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_license_familygpl: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index c86b99d..9aa9ef6 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -17,31 +17,17 @@ jobs: timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ + MINIFORGE_HOME: D:\Miniforge UPLOAD_TEMP: D:\\tmp steps: - - task: PythonScript@0 - displayName: 'Download Miniforge' - inputs: - scriptSource: inline - script: | - import urllib.request - url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe' - path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" - urllib.request.urlretrieve(url, path) - - - script: | - start /wait "" %BUILD_ARTIFACTSTAGINGDIRECTORY%\Miniforge.exe /InstallationType=JustMe /RegisterPython=0 /S /D=C:\Miniforge - displayName: Install Miniforge - - - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" - displayName: Add conda to PATH - - script: | call ".scripts\run_win_build.bat" displayName: Run Windows build env: + MINIFORGE_HOME: $(MINIFORGE_HOME) + CONDA_BLD_PATH: $(CONDA_BLD_PATH) PYTHONUNBUFFERED: 1 CONFIG: $(CONFIG) CI: azure diff --git a/.ci_support/linux_64_license_familygpl.yaml b/.ci_support/linux_64_license_familygpl.yaml index 22e2a4b..df395dc 100644 --- a/.ci_support/linux_64_license_familygpl.yaml +++ b/.ci_support/linux_64_license_familygpl.yaml @@ -5,7 +5,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -13,11 +13,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' dav1d: - 1.2.1 docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 libavif: - '1' license_family: @@ -26,6 +26,3 @@ target_platform: - linux-64 x265: - '3.5' -zip_keys: -- - c_stdlib_version - - cdt_name diff --git a/.ci_support/linux_64_license_familylgpl.yaml b/.ci_support/linux_64_license_familylgpl.yaml index 7bf2d13..79c93dd 100644 --- a/.ci_support/linux_64_license_familylgpl.yaml +++ b/.ci_support/linux_64_license_familylgpl.yaml @@ -5,7 +5,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -13,11 +13,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' dav1d: - 1.2.1 docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 libavif: - '1' license_family: @@ -26,6 +26,3 @@ target_platform: - linux-64 x265: - '3.5' -zip_keys: -- - c_stdlib_version - - cdt_name diff --git a/.ci_support/linux_aarch64_license_familygpl.yaml b/.ci_support/linux_aarch64_license_familygpl.yaml index c6a7e57..f9a065b 100644 --- a/.ci_support/linux_aarch64_license_familygpl.yaml +++ b/.ci_support/linux_aarch64_license_familygpl.yaml @@ -1,15 +1,11 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu aom: - '3.9' c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -17,11 +13,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' dav1d: - 1.2.1 docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 libavif: - '1' license_family: @@ -30,6 +26,3 @@ target_platform: - linux-aarch64 x265: - '3.5' -zip_keys: -- - c_stdlib_version - - cdt_name diff --git a/.ci_support/linux_aarch64_license_familylgpl.yaml b/.ci_support/linux_aarch64_license_familylgpl.yaml index acf7146..1c0d718 100644 --- a/.ci_support/linux_aarch64_license_familylgpl.yaml +++ b/.ci_support/linux_aarch64_license_familylgpl.yaml @@ -1,15 +1,11 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu aom: - '3.9' c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -17,11 +13,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' dav1d: - 1.2.1 docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 libavif: - '1' license_family: @@ -30,6 +26,3 @@ target_platform: - linux-aarch64 x265: - '3.5' -zip_keys: -- - c_stdlib_version - - cdt_name diff --git a/.ci_support/linux_ppc64le_license_familygpl.yaml b/.ci_support/linux_ppc64le_license_familygpl.yaml index 9fe0b65..0e1c8dd 100644 --- a/.ci_support/linux_ppc64le_license_familygpl.yaml +++ b/.ci_support/linux_ppc64le_license_familygpl.yaml @@ -5,7 +5,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -13,11 +13,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' dav1d: - 1.2.1 docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 libavif: - '1' license_family: @@ -26,6 +26,3 @@ target_platform: - linux-ppc64le x265: - '3.5' -zip_keys: -- - c_stdlib_version - - cdt_name diff --git a/.ci_support/linux_ppc64le_license_familylgpl.yaml b/.ci_support/linux_ppc64le_license_familylgpl.yaml index ddf0884..542933b 100644 --- a/.ci_support/linux_ppc64le_license_familylgpl.yaml +++ b/.ci_support/linux_ppc64le_license_familylgpl.yaml @@ -5,7 +5,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -13,11 +13,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' dav1d: - 1.2.1 docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 libavif: - '1' license_family: @@ -26,6 +26,3 @@ target_platform: - linux-ppc64le x265: - '3.5' -zip_keys: -- - c_stdlib_version - - cdt_name diff --git a/.ci_support/osx_64_license_familygpl.yaml b/.ci_support/osx_64_license_familygpl.yaml index ea714c2..878f0e9 100644 --- a/.ci_support/osx_64_license_familygpl.yaml +++ b/.ci_support/osx_64_license_familygpl.yaml @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' dav1d: - 1.2.1 libavif: diff --git a/.ci_support/osx_64_license_familylgpl.yaml b/.ci_support/osx_64_license_familylgpl.yaml index 8561c3a..f18ea8d 100644 --- a/.ci_support/osx_64_license_familylgpl.yaml +++ b/.ci_support/osx_64_license_familylgpl.yaml @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' dav1d: - 1.2.1 libavif: diff --git a/.ci_support/osx_arm64_license_familygpl.yaml b/.ci_support/osx_arm64_license_familygpl.yaml index ff2c790..01264f4 100644 --- a/.ci_support/osx_arm64_license_familygpl.yaml +++ b/.ci_support/osx_arm64_license_familygpl.yaml @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' dav1d: - 1.2.1 libavif: diff --git a/.ci_support/osx_arm64_license_familylgpl.yaml b/.ci_support/osx_arm64_license_familylgpl.yaml index fc37d91..43d06ed 100644 --- a/.ci_support/osx_arm64_license_familylgpl.yaml +++ b/.ci_support/osx_arm64_license_familylgpl.yaml @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' dav1d: - 1.2.1 libavif: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index ba4b251..827a29f 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,18 +31,20 @@ pkgs_dirs: solver: libmamba CONDARC +mv /opt/conda/conda-meta/history /opt/conda/conda-meta/history.$(date +%Y-%m-%d-%H-%M-%S) +echo > /opt/conda/conda-meta/history +micromamba install --root-prefix ~/.conda --prefix /opt/conda \ + --yes --override-channels --channel conda-forge --strict-channel-priority \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" - # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup + + # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -74,8 +76,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..0e3c394 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -6,29 +6,41 @@ source .scripts/logging_utils.sh set -xe -MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} - -( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null - -MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" -curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" -rm -rf ${MINIFORGE_HOME} -bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} - -( endgroup "Installing a fresh version of Miniforge" ) 2> /dev/null +MINIFORGE_HOME="${MINIFORGE_HOME:-${HOME}/miniforge3}" +MINIFORGE_HOME="${MINIFORGE_HOME%/}" # remove trailing slash +export CONDA_BLD_PATH="${CONDA_BLD_PATH:-${MINIFORGE_HOME}/conda-bld}" + +( startgroup "Provisioning base env with micromamba" ) 2> /dev/null +MICROMAMBA_VERSION="1.5.10-0" +if [[ "$(uname -m)" == "arm64" ]]; then + osx_arch="osx-arm64" +else + osx_arch="osx-64" +fi +MICROMAMBA_URL="https://github.com/mamba-org/micromamba-releases/releases/download/${MICROMAMBA_VERSION}/micromamba-${osx_arch}" +MAMBA_ROOT_PREFIX="${MINIFORGE_HOME}-micromamba-$(date +%s)" +echo "Downloading micromamba ${MICROMAMBA_VERSION}" +micromamba_exe="$(mktemp -d)/micromamba" +curl -L -o "${micromamba_exe}" "${MICROMAMBA_URL}" +chmod +x "${micromamba_exe}" +echo "Creating environment" +"${micromamba_exe}" create --yes --root-prefix "${MAMBA_ROOT_PREFIX}" --prefix "${MINIFORGE_HOME}" \ + --channel conda-forge \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +echo "Moving pkgs cache from ${MAMBA_ROOT_PREFIX} to ${MINIFORGE_HOME}" +mv "${MAMBA_ROOT_PREFIX}/pkgs" "${MINIFORGE_HOME}" +echo "Cleaning up micromamba" +rm -rf "${MAMBA_ROOT_PREFIX}" "${micromamba_exe}" || true +( endgroup "Provisioning base env with micromamba" ) 2> /dev/null ( startgroup "Configuring conda" ) 2> /dev/null - -source ${MINIFORGE_HOME}/etc/profile.d/conda.sh +echo "Activating environment" +source "${MINIFORGE_HOME}/etc/profile.d/conda.sh" conda activate base export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" + @@ -88,8 +100,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 65650bf..283e143 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -3,30 +3,51 @@ :: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also :: benefit from the improvement. -:: Note: we assume a Miniforge installation is available - :: INPUTS (required environment variables) :: CONFIG: name of the .ci_support/*.yaml file for this job :: CI: azure, github_actions, or unset +:: MINIFORGE_HOME: where to install the base conda environment :: UPLOAD_PACKAGES: true or false :: UPLOAD_ON_BRANCH: true or false setlocal enableextensions enabledelayedexpansion +FOR %%A IN ("%~dp0.") DO SET "REPO_ROOT=%%~dpA" +if "%MINIFORGE_HOME%"=="" set "MINIFORGE_HOME=%USERPROFILE%\Miniforge3" +:: Remove trailing backslash, if present +if "%MINIFORGE_HOME:~-1%"=="\" set "MINIFORGE_HOME=%MINIFORGE_HOME:~0,-1%" +call :start_group "Provisioning base env with micromamba" +set "MAMBA_ROOT_PREFIX=%MINIFORGE_HOME%-micromamba-%RANDOM%" +set "MICROMAMBA_VERSION=1.5.10-0" +set "MICROMAMBA_URL=https://github.com/mamba-org/micromamba-releases/releases/download/%MICROMAMBA_VERSION%/micromamba-win-64" +set "MICROMAMBA_TMPDIR=%TMP%\micromamba-%RANDOM%" +set "MICROMAMBA_EXE=%MICROMAMBA_TMPDIR%\micromamba.exe" + +echo Downloading micromamba %MICROMAMBA_VERSION% +if not exist "%MICROMAMBA_TMPDIR%" mkdir "%MICROMAMBA_TMPDIR%" +certutil -urlcache -split -f "%MICROMAMBA_URL%" "%MICROMAMBA_EXE%" +if !errorlevel! neq 0 exit /b !errorlevel! + +echo Creating environment +call "%MICROMAMBA_EXE%" create --yes --root-prefix "%MAMBA_ROOT_PREFIX%" --prefix "%MINIFORGE_HOME%" ^ + --channel conda-forge ^ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +if !errorlevel! neq 0 exit /b !errorlevel! +echo Removing %MAMBA_ROOT_PREFIX% +del /S /Q "%MAMBA_ROOT_PREFIX%" >nul +del /S /Q "%MICROMAMBA_TMPDIR%" >nul +call :end_group + call :start_group "Configuring conda" :: Activate the base conda environment -call activate base +echo Activating environment +call "%MINIFORGE_HOME%\Scripts\activate.bat" :: Configure the solver set "CONDA_SOLVER=libmamba" if !errorlevel! neq 0 exit /b !errorlevel! set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" -:: Provision the necessary dependencies to build the recipe later -echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes -if !errorlevel! neq 0 exit /b !errorlevel! - :: Set basic configuration echo Setting up configuration setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml @@ -48,7 +69,7 @@ if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( ) if NOT [%flow_run_id%] == [] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" ) call :end_group @@ -59,8 +80,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..eff4ad6 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: and(eq(variables['Build.Reason'], 'PullRequest'), 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 diff --git a/build-locally.py b/build-locally.py index d78427b..c4a56c6 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,8 +1,11 @@ -#!/usr/bin/env python3 +#!/bin/sh +"""exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. # +# The line above this comment is a bash / sh / zsh guard +# to stop people from running it with the wrong interpreter import glob import os import platform @@ -23,6 +26,13 @@ def setup_environment(ns): os.path.dirname(__file__), "miniforge3" ) + # The default cache location might not be writable using docker on macOS. + if ns.config.startswith("linux") and platform.system() == "Darwin": + os.environ["CONDA_FORGE_DOCKER_RUN_ARGS"] = ( + os.environ.get("CONDA_FORGE_DOCKER_RUN_ARGS", "") + + " -e RATTLER_CACHE_DIR=/tmp/rattler_cache" + ) + def run_docker_build(ns): script = ".scripts/run_docker_build.sh" From f4ba8f5259d8e8c68e17b68761f072d73b149185 Mon Sep 17 00:00:00 2001 From: akrherz Date: Thu, 26 Dec 2024 16:16:03 -0600 Subject: [PATCH 3/5] appease the tick bot --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5e199dd..18407be 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,8 @@ {% set build = 0 %} {% set name = "libheif" %} {% set version = "1.19.5" %} +# ensure license_family is defined to appease bot +{% set license_family = license_family or 'notset' %} {%- if license_family == 'gpl' %} {%- set build = build + 100 %} From dba591e2e2322d5c60b6799e8b73e103b5d0853e Mon Sep 17 00:00:00 2001 From: akrherz Date: Thu, 26 Dec 2024 18:12:57 -0600 Subject: [PATCH 4/5] add suggested BUILD_TESTING flag --- recipe/bld.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index 5b233f6..f2fe111 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -9,6 +9,7 @@ cmake -G "Ninja" ^ -DWITH_EXAMPLES=OFF ^ -DWITH_SvtEnc=OFF ^ -DWITH_RAV1E=OFF ^ + -DBUILD_TESTING=OFF ^ .. if errorlevel 1 exit 1 From 83fc731dbaf3bab64c70fc2e3a862a155f3c1cec Mon Sep 17 00:00:00 2001 From: akrherz Date: Thu, 26 Dec 2024 18:13:16 -0600 Subject: [PATCH 5/5] address recipe manager parsing issue --- recipe/meta.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 18407be..f2f3fc2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -36,9 +36,7 @@ requirements: # - rav1e - dav1d - aom - {% if license_family == 'gpl' %} - - x265 - {% endif %} + - x265 # [license_family == 'gpl'] test: commands: