diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 9901917..13022dd 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -24,6 +24,7 @@ jobs: 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_.yaml b/.ci_support/linux_64_.yaml index 335a51f..5419285 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -19,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 libprotobuf: -- 5.27.5 +- 5.28.2 libyarp: - 3.10.1 target_platform: diff --git a/.ci_support/migrations/libgrpc167_libprotobuf5282.yaml b/.ci_support/migrations/libgrpc167_libprotobuf5282.yaml new file mode 100644 index 0000000..67f50fd --- /dev/null +++ b/.ci_support/migrations/libgrpc167_libprotobuf5282.yaml @@ -0,0 +1,10 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libgrpc 1.67 & libprotobuf 5.28.2 + kind: version + migration_number: 1 +libgrpc: +- "1.67" +libprotobuf: +- 5.28.2 +migrator_ts: 1729238463 diff --git a/.ci_support/migrations/libyarp3101.yaml b/.ci_support/migrations/libyarp3101.yaml deleted file mode 100644 index fb87664..0000000 --- a/.ci_support/migrations/libyarp3101.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libyarp 3.10.1 - kind: version - migration_number: 1 -libyarp: -- 3.10.1 -migrator_ts: 1732751985.5370722 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 28e943e..45dcecd 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -19,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '18' libprotobuf: -- 5.27.5 +- 5.28.2 libyarp: - 3.10.1 macos_machine: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index adfd9a8..febf48a 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -9,7 +9,7 @@ channel_targets: cxx_compiler: - vs2019 libprotobuf: -- 5.27.5 +- 5.28.2 libyarp: - 3.10.1 target_platform: diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 63147cc..ee996f4 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -6,8 +6,9 @@ source .scripts/logging_utils.sh set -xe -MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} -MINIFORGE_HOME=${MINIFORGE_HOME%/} # remove trailing slash +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" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index cc0d2c4..2e7dd39 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -36,6 +36,7 @@ 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" diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1f8e9fb..dc9e16c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,7 +15,7 @@ source: sha256: defcc9aaafca63efe605202edde3c8f1f867b89c8677f434f36a694007dc518d build: - number: 1 + number: 2 outputs: # {{ cxx_name }}