Skip to content

Commit 5a99496

Browse files
authored
Merge branch 'master' into opentelemetry-examples
2 parents 355accb + 40e5450 commit 5a99496

File tree

238 files changed

+3813
-1651
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

238 files changed

+3813
-1651
lines changed

.c3i/authorized_users.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,3 +1048,25 @@ authorized_users:
10481048
- ahmed192a
10491049
- maxpagani
10501050
- tim-goto
1051+
- tannerbitz
1052+
- PodnimatelPingvinov
1053+
- tmilnthorp
1054+
- IronTony-Stark
1055+
- edisonhello
1056+
- billyzheli
1057+
- xuzhenbao
1058+
- SunYu2004
1059+
- Thibb1
1060+
- achim-k
1061+
- JoelLefkowitz
1062+
- schuetzle-vector
1063+
- thejohnfreeman
1064+
- dimi309
1065+
- valgur
1066+
- jakobrieke
1067+
- witte
1068+
- liarokapisv
1069+
- kielby
1070+
- mayeut
1071+
- CedricSchmeits
1072+
- mwerminski

.c3i/conan_v2_ready_references.yml

Lines changed: 284 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,285 @@
11
required_for_references:
2-
- zlib
2+
- abseil
3+
- android-ndk
4+
- arduinojson
5+
- asio
6+
- autoconf
7+
- automake
8+
- aws-c-common
9+
- b2
10+
- benchmark
11+
- bison
12+
- boost
13+
- brotli
14+
- bullet3
15+
- bzip2
16+
- c-ares
17+
- catch2
18+
- cereal
19+
- civetweb
20+
- cli11
21+
- cmake
22+
- cpp-httplib
23+
- cpp-jwt
24+
- cppcodec
25+
- cryptopp
26+
- cxxopts
27+
- cyrus-sasl
28+
- double-conversion
29+
- eigen
30+
- enum-flags
31+
- expat
32+
- flac
33+
- flann
34+
- flex
35+
- fmt
36+
- fontconfig
37+
- freetype
38+
- ghc-filesystem
39+
- glu
40+
- gnu-config
41+
- gperf
42+
- gtest
43+
- icu
44+
- imath
45+
- jasper
46+
- jbig
47+
- jsoncpp
48+
- jwt-cpp
49+
- libalsa
50+
- libbacktrace
51+
- libcap
52+
- libcurl
53+
- libdeflate
54+
- libelf
55+
- libffi
56+
- libiconv
57+
- libjpeg
58+
- libjpeg-turbo
59+
- libmount
60+
- libmp3lame
61+
- libmysqlclient
62+
- libpng
63+
- libpq
64+
- libselinux
65+
- libsndfile
66+
- libsodium
67+
- libtiff
68+
- libtool
69+
- libunwind
70+
- libusb
71+
- libuuid
72+
- libuv
73+
- libwebp
74+
- libxml2
75+
- lz4
76+
- m4
77+
- magic_enum
78+
- make
79+
- mbedtls
80+
- md4c
81+
- meson
82+
- minizip
83+
- mozjpeg
84+
- mpg123
85+
- ms-gsl
86+
- msys2
87+
- nanoflann
88+
- nasm
89+
- ninja
90+
- nlohmann_json
91+
- odbc
92+
- ogg
93+
- openexr
94+
- opengl
95+
- openh264
96+
- openjpeg
97+
- opus
98+
- pcre
99+
- pcre2
100+
- picojson
101+
- pkgconf
102+
- poco
103+
- protobuf
104+
- pybind11
105+
- rabbitmq-c
106+
- range-v3
107+
- rapidjson
108+
- re2
109+
- span-lite
110+
- spdlog
111+
- spirv-headers
112+
- sqlite3
113+
- sqlitecpp
114+
- stb
115+
- strawberryperl
116+
- tcb-span
117+
- threadpool
118+
- tinyxml2
119+
- toml11
120+
- utf8proc
121+
- variant-lite
122+
- veque
123+
- vorbis
124+
- vulkan-headers
125+
- wayland
126+
- wayland-protocols
127+
- xkbcommon
128+
- xkeyboard-config
129+
- xorg
130+
- xorg-gccmakedep
131+
- xorg-macros
132+
- xorg-makedepend
133+
- xsimd
134+
- xtensor
135+
- xtl
136+
- xxhash
137+
- xz_utils
138+
- yaml-cpp
139+
- yasm
140+
- zeromq
141+
- zlib
142+
- zstd
143+
- zulu-openjdk
144+
- abseil
145+
- android-ndk
146+
- arduinojson
147+
- asio
148+
- autoconf
149+
- automake
150+
- aws-c-common
151+
- b2
152+
- benchmark
153+
- bison
154+
- boost
155+
- brotli
156+
- bullet3
157+
- bzip2
158+
- c-ares
159+
- catch2
160+
- cereal
161+
- civetweb
162+
- cli11
163+
- cmake
164+
- cpp-httplib
165+
- cpp-jwt
166+
- cppcodec
167+
- cryptopp
168+
- cxxopts
169+
- cyrus-sasl
170+
- eigen
171+
- enum-flags
172+
- expat
173+
- flac
174+
- flann
175+
- flex
176+
- fmt
177+
- fontconfig
178+
- freetype
179+
- ghc-filesystem
180+
- glu
181+
- gnu-config
182+
- gperf
183+
- gtest
184+
- icu
185+
- imath
186+
- jasper
187+
- jbig
188+
- jsoncpp
189+
- jwt-cpp
190+
- libalsa
191+
- libbacktrace
192+
- libcap
193+
- libcurl
194+
- libdeflate
195+
- libelf
196+
- libffi
197+
- libiconv
198+
- libjpeg
199+
- libjpeg-turbo
200+
- libmount
201+
- libmp3lame
202+
- libmysqlclient
203+
- libpng
204+
- libpq
205+
- libselinux
206+
- libsndfile
207+
- libsodium
208+
- libtiff
209+
- libtool
210+
- libunwind
211+
- libusb
212+
- libuuid
213+
- libuv
214+
- libwebp
215+
- libxml2
216+
- lz4
217+
- m4
218+
- magic_enum
219+
- make
220+
- mbedtls
221+
- md4c
222+
- meson
223+
- minizip
224+
- mozjpeg
225+
- mpg123
226+
- ms-gsl
227+
- msys2
228+
- nanoflann
229+
- nasm
230+
- ninja
231+
- nlohmann_json
232+
- odbc
233+
- ogg
234+
- openexr
235+
- opengl
236+
- openh264
237+
- openjpeg
238+
- openssl
239+
- opus
240+
- pcre
241+
- pcre2
242+
- picojson
243+
- pkgconf
244+
- poco
245+
- protobuf
246+
- pybind11
247+
- rabbitmq-c
248+
- range-v3
249+
- rapidjson
250+
- re2
251+
- span-lite
252+
- spdlog
253+
- spirv-headers
254+
- sqlite3
255+
- sqlitecpp
256+
- stb
257+
- strawberryperl
258+
- tcb-span
259+
- threadpool
260+
- tinyxml2
261+
- toml11
262+
- utf8proc
263+
- variant-lite
264+
- veque
265+
- vorbis
266+
- vulkan-headers
267+
- wayland
268+
- wayland-protocols
269+
- xkbcommon
270+
- xkeyboard-config
271+
- xorg
272+
- xorg-gccmakedep
273+
- xorg-macros
274+
- xorg-makedepend
275+
- xsimd
276+
- xtensor
277+
- xtl
278+
- xxhash
279+
- xz_utils
280+
- yaml-cpp
281+
- yasm
282+
- zeromq
283+
- zlib
284+
- zstd
285+
- zulu-openjdk

.c3i/config_v1.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ tasks:
4040
status_checks:
4141
- name: "license/cla"
4242
- name: "continuous-integration/jenkins/pr-merge"
43+
- name: "c3i/conan-v2/pr-merge"
44+
required_for_references: "conan_v2_ready_references.yml"
4345
cci:
4446
conan_v2_run_export: false
4547
write_comments: true

.c3i/config_v2.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
id: 'conan-io/conan-center-index'
44

55
conan:
6-
version: 2.0.0-beta10
6+
version: 2.0.0
77

88
artifactory:
99
url: "https://c3i.jfrog.io/c3i"
10-
main_repo: "conan-center-v2"
10+
main_repo: "conan-center"
1111
pull-request_repo_prefix: "c3i_PR-v2"
1212
pull-request_permission: "c3i-pr"
1313
logs_repo: "misc-v2"
@@ -46,7 +46,7 @@ tasks:
4646

4747
configurations:
4848
- id: linux-gcc
49-
epochs: [0, 20220628]
49+
epochs: [0, 20211221, 20220120, 20220628]
5050
hrname: "Linux, GCC"
5151
build_profile:
5252
os: "Linux"
@@ -59,7 +59,7 @@ configurations:
5959
compiler.version: ["11"]
6060
build_type: ["Release"]
6161
- id: configs/macos-clang
62-
epochs: [0, 20220628]
62+
epochs: [0, 20211221, 20220120, 20220628]
6363
hrname: "macOS, Clang"
6464
build_profile:
6565
os: "Macos"
@@ -72,7 +72,7 @@ configurations:
7272
compiler.libcxx: [ "libc++" ]
7373
build_type: [ "Release"]
7474
- id: configs/macos-m1-clang
75-
epochs: [0, 20220628]
75+
epochs: [0, 20211221, 20220120, 20220628]
7676
hrname: "macOS M1, Clang"
7777
build_profile:
7878
os: "Macos"
@@ -86,7 +86,7 @@ configurations:
8686
compiler.libcxx: [ "libc++" ]
8787
build_type: [ "Release"]
8888
- id: configs/windows-msvc
89-
epochs: [0, 20220628]
89+
epochs: [0, 20211221, 20220120, 20220628]
9090
hrname: "Windows, MSVC"
9191
build_profile:
9292
os: "Windows"

.github/workflows/alert-community.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: ./.github/actions/alert-community
2020
with:
2121
files: "docs/*/*"
22-
reviewers: "@prince-chrismc @MartinDelille"
22+
reviewers: "@prince-chrismc @MartinDelille @Croydon"
2323

2424
- uses: ./.github/actions/alert-community
2525
with:
@@ -64,7 +64,7 @@ jobs:
6464
- uses: ./.github/actions/alert-community
6565
with:
6666
files: "recipes/boost/*/*"
67-
reviewers: "@Hopobcn @jwillikers"
67+
reviewers: "@grafikrobot @Hopobcn @jwillikers"
6868

6969
- uses: ./.github/actions/alert-community
7070
with:

0 commit comments

Comments
 (0)