From 05803f3deb9bc4fe664632cfecad4f88a9e34e3f Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 15 Jan 2025 18:31:45 +0100 Subject: [PATCH 1/3] Bump version to 7.3.1 and temporary rebuild for libprotobuf 5.28.2 and 5.28.3 --- .ci_support/migrations/libprotobuf5283.yaml | 8 -------- recipe/conda_build_config.yaml | 3 +++ recipe/meta.yaml | 4 ++-- 3 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 .ci_support/migrations/libprotobuf5283.yaml create mode 100644 recipe/conda_build_config.yaml diff --git a/.ci_support/migrations/libprotobuf5283.yaml b/.ci_support/migrations/libprotobuf5283.yaml deleted file mode 100644 index ea1e9bc..0000000 --- a/.ci_support/migrations/libprotobuf5283.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libprotobuf 5.28.3 - kind: version - migration_number: 1 -libprotobuf: -- 5.28.3 -migrator_ts: 1729815020.8446853 diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml new file mode 100644 index 0000000..9f64731 --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,3 @@ +libprotobuf: + - 5.28.2 + - 5.28.3 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 19d909f..0ef999b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set base_name = "libignition-fuel-tools" %} -{% set version = "7_7.1.0" %} +{% set version = "7_7.3.1" %} {% set version_package = version.split('_')[1] %} {% set major_version = version_package.split('.')[0] %} {% set name = base_name + major_version %} @@ -13,7 +13,7 @@ source: sha256: 45bc8a6fa61da8ec8e75f488a91c433ec3db0276815bdbfc7db47ee659bd59e9 build: - number: 14 + number: 0 run_exports: - {{ pin_subpackage(name, max_pin='x') }} From 0e480331eea68612bf81232dbe484b2d6dfdb8a3 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2025 17:35:40 +0000 Subject: [PATCH 2/3] MNT: Re-rendered with conda-build 24.11.2, conda-smithy 3.45.2, and conda-forge-pinning 2025.01.11.16.15.44 --- .azure-pipelines/azure-pipelines-linux.yml | 24 +++++-- .azure-pipelines/azure-pipelines-osx.yml | 14 ++-- .azure-pipelines/azure-pipelines-win.yml | 7 +- .ci_support/linux_64_libprotobuf5.28.2.yaml | 35 ++++++++++ ..._.yaml => linux_64_libprotobuf5.28.3.yaml} | 0 .../linux_aarch64_libprotobuf5.28.2.yaml | 35 ++++++++++ ...l => linux_aarch64_libprotobuf5.28.3.yaml} | 0 .../linux_ppc64le_libprotobuf5.28.2.yaml | 35 ++++++++++ ...l => linux_ppc64le_libprotobuf5.28.3.yaml} | 0 .ci_support/osx_64_libprotobuf5.28.2.yaml | 37 +++++++++++ ...64_.yaml => osx_64_libprotobuf5.28.3.yaml} | 0 .ci_support/osx_arm64_libprotobuf5.28.2.yaml | 37 +++++++++++ ....yaml => osx_arm64_libprotobuf5.28.3.yaml} | 0 .ci_support/win_64_libprotobuf5.28.2.yaml | 24 +++++++ ...64_.yaml => win_64_libprotobuf5.28.3.yaml} | 0 README.md | 66 +++++++++++++++---- 16 files changed, 290 insertions(+), 24 deletions(-) create mode 100644 .ci_support/linux_64_libprotobuf5.28.2.yaml rename .ci_support/{linux_64_.yaml => linux_64_libprotobuf5.28.3.yaml} (100%) create mode 100644 .ci_support/linux_aarch64_libprotobuf5.28.2.yaml rename .ci_support/{linux_aarch64_.yaml => linux_aarch64_libprotobuf5.28.3.yaml} (100%) create mode 100644 .ci_support/linux_ppc64le_libprotobuf5.28.2.yaml rename .ci_support/{linux_ppc64le_.yaml => linux_ppc64le_libprotobuf5.28.3.yaml} (100%) create mode 100644 .ci_support/osx_64_libprotobuf5.28.2.yaml rename .ci_support/{osx_64_.yaml => osx_64_libprotobuf5.28.3.yaml} (100%) create mode 100644 .ci_support/osx_arm64_libprotobuf5.28.2.yaml rename .ci_support/{osx_arm64_.yaml => osx_arm64_libprotobuf5.28.3.yaml} (100%) create mode 100644 .ci_support/win_64_libprotobuf5.28.2.yaml rename .ci_support/{win_64_.yaml => win_64_libprotobuf5.28.3.yaml} (100%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index b1513b8..535d3d9 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,16 +8,28 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_: - CONFIG: linux_64_ + linux_64_libprotobuf5.28.2: + CONFIG: linux_64_libprotobuf5.28.2 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_aarch64_: - CONFIG: linux_aarch64_ + linux_64_libprotobuf5.28.3: + CONFIG: linux_64_libprotobuf5.28.3 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_ppc64le_: - CONFIG: linux_ppc64le_ + linux_aarch64_libprotobuf5.28.2: + CONFIG: linux_aarch64_libprotobuf5.28.2 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + linux_aarch64_libprotobuf5.28.3: + CONFIG: linux_aarch64_libprotobuf5.28.3 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + linux_ppc64le_libprotobuf5.28.2: + CONFIG: linux_ppc64le_libprotobuf5.28.2 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + linux_ppc64le_libprotobuf5.28.3: + CONFIG: linux_ppc64le_libprotobuf5.28.3 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index ac0bf38..7499017 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,11 +8,17 @@ jobs: vmImage: macOS-13 strategy: matrix: - osx_64_: - CONFIG: osx_64_ + osx_64_libprotobuf5.28.2: + CONFIG: osx_64_libprotobuf5.28.2 UPLOAD_PACKAGES: 'True' - osx_arm64_: - CONFIG: osx_arm64_ + osx_64_libprotobuf5.28.3: + CONFIG: osx_64_libprotobuf5.28.3 + UPLOAD_PACKAGES: 'True' + osx_arm64_libprotobuf5.28.2: + CONFIG: osx_arm64_libprotobuf5.28.2 + UPLOAD_PACKAGES: 'True' + osx_arm64_libprotobuf5.28.3: + CONFIG: osx_arm64_libprotobuf5.28.3 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 13022dd..4a4f70d 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,8 +8,11 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_: - CONFIG: win_64_ + win_64_libprotobuf5.28.2: + CONFIG: win_64_libprotobuf5.28.2 + UPLOAD_PACKAGES: 'True' + win_64_libprotobuf5.28.3: + CONFIG: win_64_libprotobuf5.28.3 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_libprotobuf5.28.2.yaml b/.ci_support/linux_64_libprotobuf5.28.2.yaml new file mode 100644 index 0000000..746fbe2 --- /dev/null +++ b/.ci_support/linux_64_libprotobuf5.28.2.yaml @@ -0,0 +1,35 @@ +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 +jsoncpp: +- 1.9.6 +libcurl: +- '8' +libprotobuf: +- 5.28.2 +libzip: +- '1' +target_platform: +- linux-64 +tinyxml2: +- '10' +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_libprotobuf5.28.3.yaml similarity index 100% rename from .ci_support/linux_64_.yaml rename to .ci_support/linux_64_libprotobuf5.28.3.yaml diff --git a/.ci_support/linux_aarch64_libprotobuf5.28.2.yaml b/.ci_support/linux_aarch64_libprotobuf5.28.2.yaml new file mode 100644 index 0000000..f3fe2c1 --- /dev/null +++ b/.ci_support/linux_aarch64_libprotobuf5.28.2.yaml @@ -0,0 +1,35 @@ +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 +jsoncpp: +- 1.9.6 +libcurl: +- '8' +libprotobuf: +- 5.28.2 +libzip: +- '1' +target_platform: +- linux-aarch64 +tinyxml2: +- '10' +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_libprotobuf5.28.3.yaml similarity index 100% rename from .ci_support/linux_aarch64_.yaml rename to .ci_support/linux_aarch64_libprotobuf5.28.3.yaml diff --git a/.ci_support/linux_ppc64le_libprotobuf5.28.2.yaml b/.ci_support/linux_ppc64le_libprotobuf5.28.2.yaml new file mode 100644 index 0000000..05eebef --- /dev/null +++ b/.ci_support/linux_ppc64le_libprotobuf5.28.2.yaml @@ -0,0 +1,35 @@ +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 +jsoncpp: +- 1.9.6 +libcurl: +- '8' +libprotobuf: +- 5.28.2 +libzip: +- '1' +target_platform: +- linux-ppc64le +tinyxml2: +- '10' +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_libprotobuf5.28.3.yaml similarity index 100% rename from .ci_support/linux_ppc64le_.yaml rename to .ci_support/linux_ppc64le_libprotobuf5.28.3.yaml diff --git a/.ci_support/osx_64_libprotobuf5.28.2.yaml b/.ci_support/osx_64_libprotobuf5.28.2.yaml new file mode 100644 index 0000000..18ee613 --- /dev/null +++ b/.ci_support/osx_64_libprotobuf5.28.2.yaml @@ -0,0 +1,37 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' +c_compiler: +- clang +c_compiler_version: +- '18' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '18' +jsoncpp: +- 1.9.6 +libcurl: +- '8' +libprotobuf: +- 5.28.2 +libzip: +- '1' +macos_machine: +- x86_64-apple-darwin13.4.0 +target_platform: +- osx-64 +tinyxml2: +- '10' +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_libprotobuf5.28.3.yaml similarity index 100% rename from .ci_support/osx_64_.yaml rename to .ci_support/osx_64_libprotobuf5.28.3.yaml diff --git a/.ci_support/osx_arm64_libprotobuf5.28.2.yaml b/.ci_support/osx_arm64_libprotobuf5.28.2.yaml new file mode 100644 index 0000000..d9688e9 --- /dev/null +++ b/.ci_support/osx_arm64_libprotobuf5.28.2.yaml @@ -0,0 +1,37 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +MACOSX_SDK_VERSION: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '18' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '18' +jsoncpp: +- 1.9.6 +libcurl: +- '8' +libprotobuf: +- 5.28.2 +libzip: +- '1' +macos_machine: +- arm64-apple-darwin20.0.0 +target_platform: +- osx-arm64 +tinyxml2: +- '10' +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_libprotobuf5.28.3.yaml similarity index 100% rename from .ci_support/osx_arm64_.yaml rename to .ci_support/osx_arm64_libprotobuf5.28.3.yaml diff --git a/.ci_support/win_64_libprotobuf5.28.2.yaml b/.ci_support/win_64_libprotobuf5.28.2.yaml new file mode 100644 index 0000000..de97aa1 --- /dev/null +++ b/.ci_support/win_64_libprotobuf5.28.2.yaml @@ -0,0 +1,24 @@ +c_compiler: +- vs2019 +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +jsoncpp: +- 1.9.6 +libcurl: +- '8' +libprotobuf: +- 5.28.2 +libzip: +- '1' +target_platform: +- win-64 +tinyxml2: +- '10' +zlib: +- '1' diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_libprotobuf5.28.3.yaml similarity index 100% rename from .ci_support/win_64_.yaml rename to .ci_support/win_64_libprotobuf5.28.3.yaml diff --git a/README.md b/README.md index b192d3e..da038ed 100644 --- a/README.md +++ b/README.md @@ -27,45 +27,87 @@ Current build status - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + From f30717d345d006c2c7e19025f49c2748c3991cf5 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Thu, 16 Jan 2025 05:25:51 +1000 Subject: [PATCH 3/3] Sha update --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0ef999b..2ecd8a7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,7 @@ package: source: - url: https://github.com/ignitionrobotics/ign-fuel-tools/archive/ignition-fuel-tools{{ version }}.tar.gz - sha256: 45bc8a6fa61da8ec8e75f488a91c433ec3db0276815bdbfc7db47ee659bd59e9 + sha256: e5d844d2f3093dc23495525780bf8df10278278e303360f6ea9608d9070b870e build: number: 0
VariantStatus
linux_64linux_64_libprotobuf5.28.2 - variant + variant
linux_aarch64linux_64_libprotobuf5.28.3 - variant + variant
linux_ppc64lelinux_aarch64_libprotobuf5.28.2 - variant + variant
osx_64linux_aarch64_libprotobuf5.28.3 - variant + variant
osx_arm64linux_ppc64le_libprotobuf5.28.2 - variant + variant
win_64linux_ppc64le_libprotobuf5.28.3 - variant + variant + +
osx_64_libprotobuf5.28.2 + + variant + +
osx_64_libprotobuf5.28.3 + + variant + +
osx_arm64_libprotobuf5.28.2 + + variant + +
osx_arm64_libprotobuf5.28.3 + + variant + +
win_64_libprotobuf5.28.2 + + variant + +
win_64_libprotobuf5.28.3 + + variant