Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into migrate/ogre
Browse files Browse the repository at this point in the history
  • Loading branch information
valgur committed Oct 12, 2024
2 parents 41e0be5 + 9c4849d commit ccd6d66
Show file tree
Hide file tree
Showing 477 changed files with 6,851 additions and 7,566 deletions.
9 changes: 9 additions & 0 deletions .c3i/authorized_users.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1422,3 +1422,12 @@ authorized_users:
- jorgen
- simshi
- alatarum
- joda01
- raplonu
- mattkretz
- DannyLihard
- stevenwdv
- smessmer
- fischjo3SICKAG
- jrosiek
- Thiesius
20 changes: 20 additions & 0 deletions .c3i/conan_v2_ready_references.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ required_for_references:
- andreasbuhr-cppcoro
- android-ndk
- angelscript
- ann
- annoy
- antlr4
- antlr4-cppruntime
Expand Down Expand Up @@ -61,6 +62,7 @@ required_for_references:
- asyncpp
- atomic_queue
- audiofile
- audiowaveform
- autoconf
- autoconf-archive
- automake
Expand Down Expand Up @@ -275,6 +277,7 @@ required_for_references:
- csvmonkey
- ctml
- ctpg
- ctrack
- ctre
- cub
- cubicinterpolation
Expand Down Expand Up @@ -410,6 +413,7 @@ required_for_references:
- fastnoise2
- fastpfor
- fastprng
- fcl
- fernandovelcic-hexdump
- fff
- ffmpeg
Expand Down Expand Up @@ -589,6 +593,7 @@ required_for_references:
- influxdb-cpp
- influxdb-cxx
- inih
- inipp
- inja
- intel-ipsec-mb
- intel-neon2sse
Expand Down Expand Up @@ -698,6 +703,7 @@ required_for_references:
- libcurl
- libcvd
- libdaemon
- libdatrie
- libdb
- libdc1394
- libde265
Expand Down Expand Up @@ -894,11 +900,13 @@ required_for_references:
- linmath.h
- linux-headers-generic
- linux-syscall-support
- liquid-dsp
- litehtml
- lksctp-tools
- llama-cpp
- llhttp
- llnl-units
- llvm-core
- llvm-openmp
- lmdb
- lodepng
Expand Down Expand Up @@ -929,6 +937,7 @@ required_for_references:
- mailio
- make
- makefile-project-workspace-creator
- manif
- mapbox-geometry
- mapbox-variant
- mapbox-wagyu
Expand All @@ -955,6 +964,7 @@ required_for_references:
- mdns
- mdnsresponder
- mdspan
- melon
- mesa-glu
- meshoptimizer
- meson
Expand Down Expand Up @@ -1014,6 +1024,7 @@ required_for_references:
- msix
- msys2
- mtdev
- mtfmt
- mujs
- muparser
- muparserx
Expand Down Expand Up @@ -1114,6 +1125,7 @@ required_for_references:
- openimageio
- openjdk
- openjpeg
- openjph
- openldap
- openmesh
- openmpi
Expand All @@ -1132,6 +1144,7 @@ required_for_references:
- openvino
- openvr
- openxlsx
- optimlib
- optional-lite
- opus
- opusfile
Expand Down Expand Up @@ -1202,6 +1215,7 @@ required_for_references:
- plusaes
- plutovg
- pngpp
- pocketfft
- poco
- podofo
- poly2tri
Expand Down Expand Up @@ -1244,6 +1258,7 @@ required_for_references:
- qcbor
- qdbm
- qhull
- qoi
- qpdf
- qpoases
- qr-code-generator
Expand All @@ -1260,6 +1275,7 @@ required_for_references:
- quill
- quirc
- qwt
- qxlsx
- qxmpp
- r8brain-free-src
- rabbitmq-c
Expand All @@ -1271,6 +1287,7 @@ required_for_references:
- rapidcheck
- rapidcsv
- rapidfuzz
- rapidhash
- rapidjson
- rapidxml
- rapidyaml
Expand Down Expand Up @@ -1398,6 +1415,7 @@ required_for_references:
- spirv-cross
- spirv-headers
- spirv-tools
- splunk-opentelemetry-cpp
- spscqueue
- spy
- sqlcipher
Expand All @@ -1412,6 +1430,7 @@ required_for_references:
- ssht
- ssp
- st_tree
- statistic
- statslib
- status-code
- status-value-lite
Expand Down Expand Up @@ -1480,6 +1499,7 @@ required_for_references:
- tiny-dnn
- tiny-regex-c
- tiny-utf8
- tinyad
- tinyalsa
- tinycbor
- tinycolormap
Expand Down
3 changes: 2 additions & 1 deletion .c3i/config_v1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,12 @@ tasks:
- llvm
parallel_strategy: unlimited
cci:
conan_v2_run_export: false
write_comments: true
detailed_status_checks: false
update_labels: true
build_bump_deps_pr: false
user_feedback:
description: "> [!WARNING]\n> Conan Center will stop receiving updates for Conan 1.x packages soon - please see [announcement](https://github.com/conan-io/conan-center-index/discussions/25461)."
description_bump_deps_pr: ":vertical_traffic_light: Thank for your Bump dependencies PR. The build service will be triggered soon by a Conan team member."
wait_for_multibranch: # CCI jobs should wait for other multibranch job for that same PR
job_name: "prod-v2/cci" # e.g. "cci-v2/cci" -> this means waiting for cci-v2/cci/PR-<number>
Expand Down
1 change: 0 additions & 1 deletion .c3i/config_v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ tasks:
- gstreamer
parallel_strategy: unlimited
cci:
conan_v2_run_export: false
detailed_status_checks: true
write_comments: false
update_labels: false
Expand Down
1 change: 1 addition & 0 deletions .c3i/waitlist_users.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ waitlist_users:
- sabapathim
- pixelsoba
- liss-h
- friedbyalice
124 changes: 0 additions & 124 deletions .github/workflows/linter-conan-v2.yml

This file was deleted.

Loading

0 comments on commit ccd6d66

Please sign in to comment.