Skip to content

Commit

Permalink
Merge pull request #39 from regro-cf-autotick-bot/8.0.0_h488599
Browse files Browse the repository at this point in the history
[bot-automerge] gz-launch v8.0.0
  • Loading branch information
traversaro authored Oct 1, 2024
2 parents dddea1d + 81aa4a5 commit 2639d34
Show file tree
Hide file tree
Showing 19 changed files with 130 additions and 132 deletions.
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-osx.yml

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

2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-win.yml

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

14 changes: 10 additions & 4 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
elfutils:
Expand All @@ -24,6 +24,12 @@ libabseil:
- '20240116'
libprotobuf:
- 4.25.3
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.11.* *_cpython
qt_main:
- '5.15'
target_platform:
Expand Down
10 changes: 8 additions & 2 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BUILD:
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
Expand All @@ -19,7 +19,7 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
elfutils:
Expand All @@ -28,6 +28,12 @@ libabseil:
- '20240116'
libprotobuf:
- 4.25.3
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.11.* *_cpython
qt_main:
- '5.15'
target_platform:
Expand Down

This file was deleted.

This file was deleted.

51 changes: 0 additions & 51 deletions .ci_support/migrations/libgoogle_cloud222.yaml

This file was deleted.

12 changes: 10 additions & 2 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
c_compiler:
- clang
c_compiler_version:
- '16'
- '17'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -15,13 +17,19 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '17'
libabseil:
- '20240116'
libprotobuf:
- 4.25.3
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.11.* *_cpython
qt_main:
- '5.15'
target_platform:
Expand Down
12 changes: 10 additions & 2 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
c_compiler:
- clang
c_compiler_version:
- '16'
- '17'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -15,13 +17,19 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '17'
libabseil:
- '20240116'
libprotobuf:
- 4.25.3
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.11.* *_cpython
qt_main:
- '5.15'
target_platform:
Expand Down
8 changes: 6 additions & 2 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ c_compiler:
- vs2019
c_stdlib:
- vs
c_stdlib_version:
- '2019'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -14,6 +12,12 @@ libabseil:
- '20240116'
libprotobuf:
- 4.25.3
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.11.* *_cpython
qt_main:
- '5.15'
target_platform:
Expand Down
4 changes: 2 additions & 2 deletions .gitattributes

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

8 changes: 8 additions & 0 deletions .scripts/build_steps.sh

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

9 changes: 8 additions & 1 deletion .scripts/run_osx_build.sh

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

9 changes: 7 additions & 2 deletions .scripts/run_win_build.bat

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

Loading

0 comments on commit 2639d34

Please sign in to comment.