diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 8d62612..3b9dee7 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -11,7 +11,15 @@ jobs: linux_64_: CONFIG: linux_64_ UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_: + CONFIG: linux_aarch64_ + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_: + CONFIG: linux_ppc64le_ + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 steps: diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 374006c..858bd2f 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -13,9 +13,9 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- '3.18' +- '3.19' target_platform: - linux-64 tinyxml2: @@ -23,5 +23,3 @@ tinyxml2: zip_keys: - - c_compiler_version - cxx_compiler_version -- - cdt_name - - docker_image diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index e2c9181..cc76e97 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -17,9 +17,9 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- '3.18' +- '3.19' target_platform: - linux-aarch64 tinyxml2: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index fe30dbc..2dab0ff 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -13,9 +13,9 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- '3.18' +- '3.19' target_platform: - linux-ppc64le tinyxml2: diff --git a/.ci_support/migrations/libprotobuf318.yaml b/.ci_support/migrations/libprotobuf319.yaml similarity index 66% rename from .ci_support/migrations/libprotobuf318.yaml rename to .ci_support/migrations/libprotobuf319.yaml index 328967a..bafbe1f 100644 --- a/.ci_support/migrations/libprotobuf318.yaml +++ b/.ci_support/migrations/libprotobuf319.yaml @@ -3,5 +3,5 @@ __migrator: kind: version migration_number: 1 libprotobuf: -- '3.18' -migrator_ts: 1631764220.7977521 +- '3.19' +migrator_ts: 1634806373.384677 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 7a40cf8..942a1cb 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '11' libprotobuf: -- '3.18' +- '3.19' macos_machine: - x86_64-apple-darwin13.4.0 target_platform: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 0fd8ea3..d4478a6 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '11' libprotobuf: -- '3.18' +- '3.19' macos_machine: - arm64-apple-darwin20.0.0 target_platform: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 74a026d..dde9c11 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2017 libprotobuf: -- '3.18' +- '3.19' target_platform: - win-64 tinyxml2: diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index f816045..0000000 --- a/.drone.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -kind: pipeline -name: linux_aarch64_ - -platform: - os: linux - arch: arm64 - -steps: -- name: Install and build - image: quay.io/condaforge/linux-anvil-aarch64 - environment: - CONFIG: linux_aarch64_ - UPLOAD_PACKAGES: True - PLATFORM: linux-aarch64 - BINSTAR_TOKEN: - from_secret: BINSTAR_TOKEN - FEEDSTOCK_TOKEN: - from_secret: FEEDSTOCK_TOKEN - STAGING_BINSTAR_TOKEN: - from_secret: STAGING_BINSTAR_TOKEN - commands: - - export FEEDSTOCK_ROOT="$DRONE_WORKSPACE" - - export RECIPE_ROOT="$FEEDSTOCK_ROOT/recipe" - - export CI=drone - - export GIT_BRANCH="$DRONE_BRANCH" - - export FEEDSTOCK_NAME=$(basename ${DRONE_REPO_NAME}) - - export IS_PR_BUILD=$(if [[ "$${DRONE_PULL_REQUEST:-}" == "" ]]; then echo "False"; else echo "True"; fi) - - sed -i '$ichown -R conda:conda "$FEEDSTOCK_ROOT"' /opt/docker/bin/entrypoint - - /opt/docker/bin/entrypoint $FEEDSTOCK_ROOT/.scripts/build_steps.sh - - echo "Done building" - diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index fb73b82..0000000 --- a/.travis.yml +++ /dev/null @@ -1,22 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. - -language: generic - - - -matrix: - include: - - env: CONFIG=linux_ppc64le_ UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - -script: - - export CI=travis - - export GIT_BRANCH="$TRAVIS_BRANCH" - - export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) - - if [[ "${TRAVIS_PULL_REQUEST:-}" == "false" ]]; then export IS_PR_BUILD="False"; else export IS_PR_BUILD="True"; fi - - - - if [[ ${PLATFORM} =~ .*linux.* ]]; then CONDA_FORGE_DOCKER_RUN_ARGS=--network=host ./.scripts/run_docker_build.sh; fi \ No newline at end of file diff --git a/README.md b/README.md index f5080e8..110b14e 100644 --- a/README.md +++ b/README.md @@ -13,21 +13,7 @@ Current build status ==================== - - - - - - - +
Travis - - macOS - -
Drone - - linux - -
@@ -123,7 +109,8 @@ conda search libignition-msgs8 --channel conda-forge About conda-forge ================= -[![Powered by NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](http://numfocus.org) +[![Powered by +NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](https://numfocus.org) conda-forge is a community-led conda channel of installable packages. In order to provide high-quality builds, the process has been automated into the diff --git a/conda-forge.yml b/conda-forge.yml index 8a62c65..c70a898 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,7 +1,15 @@ bot: - abi_migration_branches: [v5.3.0, v6.4.0, v7] + abi_migration_branches: + - v5.3.0 + - v6.4.0 + - v7 automerge: true -build_platform: {osx_arm64: osx_64} +build_platform: + linux_aarch64: linux_64 + linux_ppc64le: linux_64 + osx_arm64: osx_64 conda_forge_output_validation: true -provider: {linux_aarch64: default, linux_ppc64le: default} +provider: + linux_aarch64: default + linux_ppc64le: default test_on_native_only: true diff --git a/recipe/build.sh b/recipe/build.sh index f24e6ed..b3a63d5 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -8,6 +8,7 @@ if [[ "$CONDA_BUILD_CROSS_COMPILATION" == 1 ]]; then export CC=$CC_FOR_BUILD export CXX=$CXX_FOR_BUILD export LDFLAGS=${LDFLAGS//$PREFIX/$BUILD_PREFIX} + export PKG_CONFIG_PATH=${PKG_CONFIG_PATH//$PREFIX/$BUILD_PREFIX} # Unset them as we're ok with builds that are either slow or non-portable unset CFLAGS @@ -41,6 +42,9 @@ cmake ${CMAKE_ARGS} .. \ cmake --build . --config Release cmake --build . --config Release --target install export CTEST_OUTPUT_ON_FAILURE=1 -if [[ "${CONDA_BUILD_CROSS_COMPILATION}" != "1" ]]; then - ctest -C Release -E "INTEGRATION|PERFORMANCE|REGRESSION" +if [[ "${CONDA_BUILD_CROSS_COMPILATION:-}" != "1" || "${CROSSCOMPILING_EMULATOR}" != "" ]]; then + if [[ "${CONDA_BUILD_CROSS_COMPILATION}" != "" ]]; then + export CTEST_DISABLED_TESTS="UNIT_ign_TEST" + fi + ctest -C Release -E "${CTEST_DISABLED_TESTS}" fi diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8897dee..fab4845 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,7 +11,7 @@ source: sha256: 49e69ff0be5858cf62529b7072672364989b0cdde7c3a46bbdf739527e217350 build: - number: 0 + number: 1 run_exports: - {{ pin_subpackage(name, max_pin='x') }}
Azure