Skip to content

Commit

Permalink
Merge branch 'master' into restinio
Browse files Browse the repository at this point in the history
  • Loading branch information
gegles committed May 30, 2024
2 parents 010c1a3 + 395f6e0 commit 6623be4
Show file tree
Hide file tree
Showing 237 changed files with 3,354 additions and 5,580 deletions.
7 changes: 7 additions & 0 deletions .c3i/authorized_users.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1352,3 +1352,10 @@ authorized_users:
- inPhraZ
- nikolay-pv
- Julianiolo
- ErikHons
- enzo-pellegrini
- BLumia
- ydcpp
- tttapa
- zeeshancs07
- jll63
5 changes: 5 additions & 0 deletions .c3i/conan_v2_ready_references.yml
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,7 @@ required_for_references:
- dbg-macro
- dbus
- dcmtk
- dd-opentracing-cpp
- debug_assert
- decimal_for_cpp
- deco
Expand Down Expand Up @@ -734,6 +735,7 @@ required_for_references:
- libmagic
- libmaxminddb
- libmbus
- libmd
- libmediainfo
- libmemcached
- libmetalink
Expand Down Expand Up @@ -990,6 +992,7 @@ required_for_references:
- nextsilicon-cpp-subprocess
- nfrechette-acl
- nghttp3
- nifti_clib
- ninja
- nlohmann_json
- nlopt
Expand Down Expand Up @@ -1069,6 +1072,7 @@ required_for_references:
- openmesh
- openmvg
- openpam
- openscenegraph
- openssh
- openssl
- opensubdiv
Expand Down Expand Up @@ -1136,6 +1140,7 @@ required_for_references:
- platform.exceptions
- platform.hashing
- platform.interfaces
- platformfolders
- playrho
- plf_colony
- plf_indiesort
Expand Down
2 changes: 1 addition & 1 deletion .c3i/config_v1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
id: 'conan-io/conan-center-index'

conan:
version: 1.64.0
version: 1.64.1

artifactory:
url: "https://c3i.jfrog.io/c3i"
Expand Down
2 changes: 1 addition & 1 deletion .c3i/config_v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
id: 'conan-io/conan-center-index'

conan:
version: 2.2.2
version: 2.3.1
backup_sources:
upload_url: "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"
download_url: "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"
Expand Down
31 changes: 0 additions & 31 deletions .github/actions/alert-community/action.yml

This file was deleted.

Loading

0 comments on commit 6623be4

Please sign in to comment.