Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rebuild for libprotobuf319 #63

Merged
merged 5 commits into from
Dec 12, 2021
Merged

Rebuild for libprotobuf319 #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6200d28
Rebuild for libprotobuf319
regro-cf-autotick-bot Dec 9, 2021
170caa3
MNT: Re-rendered with conda-build 3.21.7, conda-smithy 3.15.0, and co…
regro-cf-autotick-bot Dec 9, 2021
dffc38d
Update build.sh
traversaro Dec 12, 2021
6950d8c
Update build.sh
traversaro Dec 12, 2021
ee5987b
Fix
Tobias-Fischer Dec 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions .ci_support/linux_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,13 @@ 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:
- '9'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - cdt_name
- docker_image
4 changes: 2 additions & 2 deletions .ci_support/linux_aarch64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_ppc64le_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/migrations/libprotobuf318.yaml → .ci_support/migrations/libprotobuf319.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ __migrator:
kind: version
migration_number: 1
libprotobuf:
- '3.18'
migrator_ts: 1631764220.7977521
- '3.19'
migrator_ts: 1634806373.384677
2 changes: 1 addition & 1 deletion .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '11'
libprotobuf:
- '3.18'
- '3.19'
macos_machine:
- arm64-apple-darwin20.0.0
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ channel_targets:
cxx_compiler:
- vs2017
libprotobuf:
- '3.18'
- '3.19'
target_platform:
- win-64
tinyxml2:
Expand Down
32 changes: 0 additions & 32 deletions .drone.yml
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions .travis.yml
View file
Open in desktop

This file was deleted.

19 changes: 3 additions & 16 deletions README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 11 additions & 3 deletions conda-forge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
8 changes: 6 additions & 2 deletions recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ source:
sha256: 49e69ff0be5858cf62529b7072672364989b0cdde7c3a46bbdf739527e217350

build:
number: 0
number: 1
run_exports:
- {{ pin_subpackage(name, max_pin='x') }}

Expand Down