Skip to content

Commit

Permalink
Merge pull request #51 from conda-forge-admin/conda_forge_admin_50
Browse files Browse the repository at this point in the history
Rebuild with ace 8.0.1 and stop using CDTs for OpenGL
  • Loading branch information
traversaro authored Oct 2, 2024
2 parents a557db3 + 88e9e1e commit 46bd95b
Show file tree
Hide file tree
Showing 60 changed files with 2,208 additions and 202 deletions.
96 changes: 84 additions & 12 deletions .azure-pipelines/azure-pipelines-linux.yml

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

52 changes: 44 additions & 8 deletions .azure-pipelines/azure-pipelines-osx.yml

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

28 changes: 23 additions & 5 deletions .azure-pipelines/azure-pipelines-win.yml

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

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
ffmpeg:
Expand All @@ -26,6 +26,8 @@ libopencv:
- 4.10.0
libpng:
- '1.6'
libyarp:
- 3.9.0
openssl:
- '3'
pin_run_as_build:
Expand All @@ -34,11 +36,6 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.12.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_73_pypy
- 3.9.* *_cpython
qt_main:
- '5.15'
sqlite:
Expand Down
49 changes: 49 additions & 0 deletions .ci_support/linux_64_ffmpeg6python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
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
cxx_compiler:
- gxx
cxx_compiler_version:
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
ffmpeg:
- '6'
libjpeg_turbo:
- '3'
libopencv:
- 4.10.0
libpng:
- '1.6'
libyarp:
- 3.9.0
openssl:
- '3'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.11.* *_cpython
qt_main:
- '5.15'
sqlite:
- '3'
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
49 changes: 49 additions & 0 deletions .ci_support/linux_64_ffmpeg6python3.12.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
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
cxx_compiler:
- gxx
cxx_compiler_version:
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
ffmpeg:
- '6'
libjpeg_turbo:
- '3'
libopencv:
- 4.10.0
libpng:
- '1.6'
libyarp:
- 3.9.0
openssl:
- '3'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.12.* *_cpython
qt_main:
- '5.15'
sqlite:
- '3'
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
Loading

0 comments on commit 46bd95b

Please sign in to comment.