diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 846b398..d0c7a67 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,46 +8,26 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6: - CONFIG: linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6 + linux_64_GZ_CLI_NAME_VARIANTgzcompatname: + CONFIG: linux_64_GZ_CLI_NAME_VARIANTgzcompatname UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6 - linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7: - CONFIG: linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7 + SHORT_CONFIG: linux_64_GZ_CLI_NAME_VARIANTgzcompatname + linux_64_GZ_CLI_NAME_VARIANTorigname: + CONFIG: linux_64_GZ_CLI_NAME_VARIANTorigname UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7 - linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg6: - CONFIG: linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg6 + SHORT_CONFIG: linux_64_GZ_CLI_NAME_VARIANTorigname + linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatname: + CONFIG: linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatname UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg6 - linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg7: - CONFIG: linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg7 + SHORT_CONFIG: linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatname + linux_aarch64_GZ_CLI_NAME_VARIANTorigname: + CONFIG: linux_aarch64_GZ_CLI_NAME_VARIANTorigname UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg7 - linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6: - CONFIG: linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_aarch64_GZ_CLI_NAME_VARIANTgz_hb084554797 - linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7: - CONFIG: linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_aarch64_GZ_CLI_NAME_VARIANTgz_hda111d1591 - linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg6: - CONFIG: linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg6 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg6 - linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg7: - CONFIG: linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg7 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg7 + SHORT_CONFIG: linux_aarch64_GZ_CLI_NAME_VARIANTorigname timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index f576bc5..38fbe17 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,41 +5,25 @@ jobs: - job: osx pool: - vmImage: macOS-12 + vmImage: macOS-13 strategy: matrix: - osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6: - CONFIG: osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6 + osx_64_GZ_CLI_NAME_VARIANTgzcompatname: + CONFIG: osx_64_GZ_CLI_NAME_VARIANTgzcompatname UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6 - osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7: - CONFIG: osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7 + SHORT_CONFIG: osx_64_GZ_CLI_NAME_VARIANTgzcompatname + osx_64_GZ_CLI_NAME_VARIANTorigname: + CONFIG: osx_64_GZ_CLI_NAME_VARIANTorigname UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7 - osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg6: - CONFIG: osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg6 + SHORT_CONFIG: osx_64_GZ_CLI_NAME_VARIANTorigname + osx_arm64_GZ_CLI_NAME_VARIANTgzcompatname: + CONFIG: osx_arm64_GZ_CLI_NAME_VARIANTgzcompatname UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg6 - osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg7: - CONFIG: osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg7 + SHORT_CONFIG: osx_arm64_GZ_CLI_NAME_VARIANTgzcompatname + osx_arm64_GZ_CLI_NAME_VARIANTorigname: + CONFIG: osx_arm64_GZ_CLI_NAME_VARIANTorigname UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg7 - osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6: - CONFIG: osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6 - UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6 - osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7: - CONFIG: osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7 - UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7 - osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg6: - CONFIG: osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg6 - UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg6 - osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg7: - CONFIG: osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg7 - UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg7 + SHORT_CONFIG: osx_arm64_GZ_CLI_NAME_VARIANTorigname timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index c8746aa..8c2e740 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,50 +8,27 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6: - CONFIG: win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6 + win_64_GZ_CLI_NAME_VARIANTgzcompatname: + CONFIG: win_64_GZ_CLI_NAME_VARIANTgzcompatname UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6 - win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7: - CONFIG: win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7 + SHORT_CONFIG: win_64_GZ_CLI_NAME_VARIANTgzcompatname + win_64_GZ_CLI_NAME_VARIANTorigname: + CONFIG: win_64_GZ_CLI_NAME_VARIANTorigname UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7 - win_64_GZ_CLI_NAME_VARIANTorignameffmpeg6: - CONFIG: win_64_GZ_CLI_NAME_VARIANTorignameffmpeg6 - UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: win_64_GZ_CLI_NAME_VARIANTorignameffmpeg6 - win_64_GZ_CLI_NAME_VARIANTorignameffmpeg7: - CONFIG: win_64_GZ_CLI_NAME_VARIANTorignameffmpeg7 - UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: win_64_GZ_CLI_NAME_VARIANTorignameffmpeg7 + SHORT_CONFIG: win_64_GZ_CLI_NAME_VARIANTorigname 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) PYTHONUNBUFFERED: 1 CONFIG: $(CONFIG) CI: azure @@ -64,6 +41,7 @@ jobs: FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - script: | + set MINIFORGE_HOME=$(MINIFORGE_HOME) set CI=azure set CI_RUN_ID=$(build.BuildNumber).$(system.JobAttempt) set FEEDSTOCK_NAME=$(build.Repository.Name) diff --git a/.ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml b/.ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatname.yaml similarity index 98% rename from .ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml rename to .ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatname.yaml index af74dac..b730c75 100644 --- a/.ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml +++ b/.ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatname.yaml @@ -47,7 +47,7 @@ libgdal: libode: - 0.16.2 libprotobuf: -- 5.27.5 +- 5.28.2 libuuid: - '2' libxcb: diff --git a/.ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml b/.ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml deleted file mode 100644 index 0b23214..0000000 --- a/.ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml +++ /dev/null @@ -1,69 +0,0 @@ -GZ_CLI_NAME_VARIANT: -- gzcompatname -assimp: -- 5.4.3 -bullet_cpp: -- '3.25' -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -curl: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -ffmpeg: -- '6' -graphviz: -- '12' -hdf5: -- 1.14.3 -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libboost_devel: -- '1.86' -libcblas: -- 3.9 *netlib -libcurl: -- '8' -libgdal: -- '3.9' -libode: -- 0.16.2 -libprotobuf: -- 5.27.5 -libuuid: -- '2' -libxcb: -- '1' -qt_main: -- '5.15' -target_platform: -- linux-64 -tbb_devel: -- '2021' -tinyxml2: -- '10' -urdfdom: -- '4.0' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - c_stdlib_version - - cdt_name diff --git a/.ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml b/.ci_support/linux_64_GZ_CLI_NAME_VARIANTorigname.yaml similarity index 98% rename from .ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml rename to .ci_support/linux_64_GZ_CLI_NAME_VARIANTorigname.yaml index c229f85..ae1abd4 100644 --- a/.ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml +++ b/.ci_support/linux_64_GZ_CLI_NAME_VARIANTorigname.yaml @@ -47,7 +47,7 @@ libgdal: libode: - 0.16.2 libprotobuf: -- 5.27.5 +- 5.28.2 libuuid: - '2' libxcb: diff --git a/.ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml b/.ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml deleted file mode 100644 index 615641a..0000000 --- a/.ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml +++ /dev/null @@ -1,69 +0,0 @@ -GZ_CLI_NAME_VARIANT: -- origname -assimp: -- 5.4.3 -bullet_cpp: -- '3.25' -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -curl: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -ffmpeg: -- '6' -graphviz: -- '12' -hdf5: -- 1.14.3 -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libboost_devel: -- '1.86' -libcblas: -- 3.9 *netlib -libcurl: -- '8' -libgdal: -- '3.9' -libode: -- 0.16.2 -libprotobuf: -- 5.27.5 -libuuid: -- '2' -libxcb: -- '1' -qt_main: -- '5.15' -target_platform: -- linux-64 -tbb_devel: -- '2021' -tinyxml2: -- '10' -urdfdom: -- '4.0' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - c_stdlib_version - - cdt_name diff --git a/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml b/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatname.yaml similarity index 98% rename from .ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml rename to .ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatname.yaml index 550266e..088fd64 100644 --- a/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml +++ b/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatname.yaml @@ -51,7 +51,7 @@ libgdal: libode: - 0.16.2 libprotobuf: -- 5.27.5 +- 5.28.2 libuuid: - '2' libxcb: diff --git a/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml b/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml deleted file mode 100644 index 4387de3..0000000 --- a/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml +++ /dev/null @@ -1,73 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -GZ_CLI_NAME_VARIANT: -- gzcompatname -assimp: -- 5.4.3 -bullet_cpp: -- '3.25' -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -curl: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -ffmpeg: -- '6' -graphviz: -- '12' -hdf5: -- 1.14.3 -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libboost_devel: -- '1.86' -libcblas: -- 3.9 *netlib -libcurl: -- '8' -libgdal: -- '3.9' -libode: -- 0.16.2 -libprotobuf: -- 5.27.5 -libuuid: -- '2' -libxcb: -- '1' -qt_main: -- '5.15' -target_platform: -- linux-aarch64 -tbb_devel: -- '2021' -tinyxml2: -- '10' -urdfdom: -- '4.0' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - c_stdlib_version - - cdt_name diff --git a/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml b/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorigname.yaml similarity index 98% rename from .ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml rename to .ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorigname.yaml index 57426f3..2d3c35c 100644 --- a/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml +++ b/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorigname.yaml @@ -51,7 +51,7 @@ libgdal: libode: - 0.16.2 libprotobuf: -- 5.27.5 +- 5.28.2 libuuid: - '2' libxcb: diff --git a/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml b/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml deleted file mode 100644 index f790105..0000000 --- a/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml +++ /dev/null @@ -1,73 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -GZ_CLI_NAME_VARIANT: -- origname -assimp: -- 5.4.3 -bullet_cpp: -- '3.25' -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -curl: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -ffmpeg: -- '6' -graphviz: -- '12' -hdf5: -- 1.14.3 -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libboost_devel: -- '1.86' -libcblas: -- 3.9 *netlib -libcurl: -- '8' -libgdal: -- '3.9' -libode: -- 0.16.2 -libprotobuf: -- 5.27.5 -libuuid: -- '2' -libxcb: -- '1' -qt_main: -- '5.15' -target_platform: -- linux-aarch64 -tbb_devel: -- '2021' -tinyxml2: -- '10' -urdfdom: -- '4.0' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - c_stdlib_version - - cdt_name diff --git a/.ci_support/migrations/ffmpeg7.yaml b/.ci_support/migrations/ffmpeg7.yaml deleted file mode 100644 index ba8f6e9..0000000 --- a/.ci_support/migrations/ffmpeg7.yaml +++ /dev/null @@ -1,9 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for ffmpeg 7 - kind: version - migration_number: 1 -ffmpeg: -- '6' -- '7' -migrator_ts: 1714879707.672227 diff --git a/.ci_support/migrations/libabseil20240722_grpc165_libprotobuf5275.yaml b/.ci_support/migrations/libabseil20240722_grpc165_libprotobuf5275.yaml deleted file mode 100644 index 85540a1..0000000 --- a/.ci_support/migrations/libabseil20240722_grpc165_libprotobuf5275.yaml +++ /dev/null @@ -1,18 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libabseil 20240722, libgrp 1.65 & libprotobuf 5.27.5 - kind: version - migration_number: 1 - exclude: - - abseil-cpp - - grpc-cpp - - libprotobuf - - protobuf - - re2 -libabseil: -- 20240722 -libgrpc: -- "1.65" -libprotobuf: -- 5.27.5 -migrator_ts: 1727040240.8650293 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/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml b/.ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatname.yaml similarity index 97% rename from .ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml rename to .ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatname.yaml index c888cdf..0835ff3 100644 --- a/.ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml +++ b/.ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatname.yaml @@ -13,7 +13,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -27,7 +27,7 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' ffmpeg: - '7' graphviz: @@ -49,7 +49,7 @@ libgdal: libode: - 0.16.2 libprotobuf: -- 5.27.5 +- 5.28.2 libxcb: - '1' macos_machine: diff --git a/.ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml b/.ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml deleted file mode 100644 index bafe0fc..0000000 --- a/.ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml +++ /dev/null @@ -1,73 +0,0 @@ -GZ_CLI_NAME_VARIANT: -- gzcompatname -MACOSX_DEPLOYMENT_TARGET: -- '10.15' -MACOSX_SDK_VERSION: -- '10.15' -assimp: -- 5.4.3 -bullet_cpp: -- '3.25' -bzip2: -- '1' -c_compiler: -- clang -c_compiler_version: -- '17' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -curl: -- '8' -cxx_compiler: -- clangxx -cxx_compiler_version: -- '17' -ffmpeg: -- '6' -graphviz: -- '12' -hdf5: -- 1.14.3 -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libboost_devel: -- '1.86' -libcblas: -- 3.9 *netlib -libcurl: -- '8' -libgdal: -- '3.9' -libode: -- 0.16.2 -libprotobuf: -- 5.27.5 -libxcb: -- '1' -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.15' -qt_main: -- '5.15' -target_platform: -- osx-64 -tbb_devel: -- '2021' -tinyxml2: -- '10' -urdfdom: -- '4.0' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -zlib: -- '1' diff --git a/.ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml b/.ci_support/osx_64_GZ_CLI_NAME_VARIANTorigname.yaml similarity index 97% rename from .ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml rename to .ci_support/osx_64_GZ_CLI_NAME_VARIANTorigname.yaml index 0d4e3f0..3e19052 100644 --- a/.ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml +++ b/.ci_support/osx_64_GZ_CLI_NAME_VARIANTorigname.yaml @@ -13,7 +13,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -27,7 +27,7 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' ffmpeg: - '7' graphviz: @@ -49,7 +49,7 @@ libgdal: libode: - 0.16.2 libprotobuf: -- 5.27.5 +- 5.28.2 libxcb: - '1' macos_machine: diff --git a/.ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml b/.ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml deleted file mode 100644 index 0282c12..0000000 --- a/.ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml +++ /dev/null @@ -1,73 +0,0 @@ -GZ_CLI_NAME_VARIANT: -- origname -MACOSX_DEPLOYMENT_TARGET: -- '10.15' -MACOSX_SDK_VERSION: -- '10.15' -assimp: -- 5.4.3 -bullet_cpp: -- '3.25' -bzip2: -- '1' -c_compiler: -- clang -c_compiler_version: -- '17' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -curl: -- '8' -cxx_compiler: -- clangxx -cxx_compiler_version: -- '17' -ffmpeg: -- '6' -graphviz: -- '12' -hdf5: -- 1.14.3 -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libboost_devel: -- '1.86' -libcblas: -- 3.9 *netlib -libcurl: -- '8' -libgdal: -- '3.9' -libode: -- 0.16.2 -libprotobuf: -- 5.27.5 -libxcb: -- '1' -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.15' -qt_main: -- '5.15' -target_platform: -- osx-64 -tbb_devel: -- '2021' -tinyxml2: -- '10' -urdfdom: -- '4.0' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -zlib: -- '1' diff --git a/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml b/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatname.yaml similarity index 97% rename from .ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml rename to .ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatname.yaml index 36a934e..3a842da 100644 --- a/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml +++ b/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatname.yaml @@ -13,7 +13,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -27,7 +27,7 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' ffmpeg: - '7' graphviz: @@ -49,7 +49,7 @@ libgdal: libode: - 0.16.2 libprotobuf: -- 5.27.5 +- 5.28.2 libxcb: - '1' macos_machine: diff --git a/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml b/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml deleted file mode 100644 index ddea3bc..0000000 --- a/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml +++ /dev/null @@ -1,71 +0,0 @@ -GZ_CLI_NAME_VARIANT: -- gzcompatname -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -MACOSX_SDK_VERSION: -- '11.0' -assimp: -- 5.4.3 -bullet_cpp: -- '3.25' -bzip2: -- '1' -c_compiler: -- clang -c_compiler_version: -- '17' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -curl: -- '8' -cxx_compiler: -- clangxx -cxx_compiler_version: -- '17' -ffmpeg: -- '6' -graphviz: -- '12' -hdf5: -- 1.14.3 -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libboost_devel: -- '1.86' -libcblas: -- 3.9 *netlib -libcurl: -- '8' -libgdal: -- '3.9' -libode: -- 0.16.2 -libprotobuf: -- 5.27.5 -libxcb: -- '1' -macos_machine: -- arm64-apple-darwin20.0.0 -qt_main: -- '5.15' -target_platform: -- osx-arm64 -tbb_devel: -- '2021' -tinyxml2: -- '10' -urdfdom: -- '4.0' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -zlib: -- '1' diff --git a/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml b/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorigname.yaml similarity index 97% rename from .ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml rename to .ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorigname.yaml index 3b1f27d..9c57615 100644 --- a/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml +++ b/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorigname.yaml @@ -13,7 +13,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -27,7 +27,7 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' ffmpeg: - '7' graphviz: @@ -49,7 +49,7 @@ libgdal: libode: - 0.16.2 libprotobuf: -- 5.27.5 +- 5.28.2 libxcb: - '1' macos_machine: diff --git a/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml b/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml deleted file mode 100644 index 63d7faa..0000000 --- a/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml +++ /dev/null @@ -1,71 +0,0 @@ -GZ_CLI_NAME_VARIANT: -- origname -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -MACOSX_SDK_VERSION: -- '11.0' -assimp: -- 5.4.3 -bullet_cpp: -- '3.25' -bzip2: -- '1' -c_compiler: -- clang -c_compiler_version: -- '17' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -curl: -- '8' -cxx_compiler: -- clangxx -cxx_compiler_version: -- '17' -ffmpeg: -- '6' -graphviz: -- '12' -hdf5: -- 1.14.3 -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libboost_devel: -- '1.86' -libcblas: -- 3.9 *netlib -libcurl: -- '8' -libgdal: -- '3.9' -libode: -- 0.16.2 -libprotobuf: -- 5.27.5 -libxcb: -- '1' -macos_machine: -- arm64-apple-darwin20.0.0 -qt_main: -- '5.15' -target_platform: -- osx-arm64 -tbb_devel: -- '2021' -tinyxml2: -- '10' -urdfdom: -- '4.0' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -zlib: -- '1' diff --git a/.ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml b/.ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatname.yaml similarity index 98% rename from .ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml rename to .ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatname.yaml index 9edfe31..3510f5b 100644 --- a/.ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml +++ b/.ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatname.yaml @@ -35,7 +35,7 @@ libgdal: libode: - 0.16.2 libprotobuf: -- 5.27.5 +- 5.28.2 qt_main: - '5.15' target_platform: diff --git a/.ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml b/.ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml deleted file mode 100644 index 40677b6..0000000 --- a/.ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml +++ /dev/null @@ -1,48 +0,0 @@ -GZ_CLI_NAME_VARIANT: -- gzcompatname -assimp: -- 5.4.3 -c_compiler: -- vs2019 -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -curl: -- '8' -cxx_compiler: -- vs2019 -ffmpeg: -- '6' -graphviz: -- '12' -hdf5: -- 1.14.3 -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libboost_devel: -- '1.86' -libcblas: -- 3.9 *netlib -libcurl: -- '8' -libgdal: -- '3.9' -libode: -- 0.16.2 -libprotobuf: -- 5.27.5 -qt_main: -- '5.15' -target_platform: -- win-64 -tbb_devel: -- '2021' -tinyxml2: -- '10' -urdfdom: -- '4.0' diff --git a/.ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml b/.ci_support/win_64_GZ_CLI_NAME_VARIANTorigname.yaml similarity index 98% rename from .ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml rename to .ci_support/win_64_GZ_CLI_NAME_VARIANTorigname.yaml index a9c3a1e..5c58c29 100644 --- a/.ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml +++ b/.ci_support/win_64_GZ_CLI_NAME_VARIANTorigname.yaml @@ -35,7 +35,7 @@ libgdal: libode: - 0.16.2 libprotobuf: -- 5.27.5 +- 5.28.2 qt_main: - '5.15' target_platform: diff --git a/.ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml b/.ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml deleted file mode 100644 index e21f2aa..0000000 --- a/.ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml +++ /dev/null @@ -1,48 +0,0 @@ -GZ_CLI_NAME_VARIANT: -- origname -assimp: -- 5.4.3 -c_compiler: -- vs2019 -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -curl: -- '8' -cxx_compiler: -- vs2019 -ffmpeg: -- '6' -graphviz: -- '12' -hdf5: -- 1.14.3 -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libboost_devel: -- '1.86' -libcblas: -- 3.9 *netlib -libcurl: -- '8' -libgdal: -- '3.9' -libode: -- 0.16.2 -libprotobuf: -- 5.27.5 -qt_main: -- '5.15' -target_platform: -- win-64 -tbb_devel: -- '2021' -tinyxml2: -- '10' -urdfdom: -- '4.0' diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 8307fca..fcf447e 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,13 +31,13 @@ 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}" @@ -88,8 +88,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..7f948c4 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -7,28 +7,39 @@ source .scripts/logging_utils.sh set -xe MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} +MINIFORGE_HOME=${MINIFORGE_HOME%/} # remove trailing slash -( 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 +( 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 +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 +99,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 a45c34f..12db999 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -3,30 +3,49 @@ :: 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 +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%" +del /S /Q "%MICROMAMBA_TMPDIR%" +call :end_group + call :start_group "Configuring conda" :: Activate the base conda environment -call activate base +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 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 @@ -59,8 +78,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/README.md b/README.md index 75dff2d..54062c5 100644 --- a/README.md +++ b/README.md @@ -35,143 +35,73 @@ Current build status - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/recipe/meta.yaml b/recipe/meta.yaml index 0d2b80f..a9a90aa 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set name = "gazebo" %} {% set version = "11.14.0" %} -{% set build_number = 19 %} +{% set build_number = 20 %} {% if GZ_CLI_NAME_VARIANT == "origname" %} {% set build_number = build_number + 200 %}
VariantStatus
linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6linux_64_GZ_CLI_NAME_VARIANTgzcompatname - variant + variant
linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7linux_64_GZ_CLI_NAME_VARIANTorigname - variant + variant
linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg6linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatname - variant + variant
linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg7linux_aarch64_GZ_CLI_NAME_VARIANTorigname - variant + variant
linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6osx_64_GZ_CLI_NAME_VARIANTgzcompatname - variant + variant
linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7osx_64_GZ_CLI_NAME_VARIANTorigname - variant + variant
linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg6osx_arm64_GZ_CLI_NAME_VARIANTgzcompatname - variant + variant
linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg7osx_arm64_GZ_CLI_NAME_VARIANTorigname - variant + variant
osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6win_64_GZ_CLI_NAME_VARIANTgzcompatname - variant + variant
osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7win_64_GZ_CLI_NAME_VARIANTorigname - variant - -
osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg6 - - variant - -
osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg7 - - variant - -
osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6 - - variant - -
osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7 - - variant - -
osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg6 - - variant - -
osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg7 - - variant - -
win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6 - - variant - -
win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7 - - variant - -
win_64_GZ_CLI_NAME_VARIANTorignameffmpeg6 - - variant - -
win_64_GZ_CLI_NAME_VARIANTorignameffmpeg7 - - variant + variant