Merge branch 'master' into qt/build-fixes

.c3i/authorized_users.yml

@@ -1049,3 +1049,32 @@ authorized_users:
 - maxpagani
 - tim-goto
 - tannerbitz
+- PodnimatelPingvinov
+- tmilnthorp
+- IronTony-Stark
+- edisonhello
+- billyzheli
+- xuzhenbao
+- SunYu2004
+- Thibb1
+- achim-k
+- JoelLefkowitz
+- schuetzle-vector
+- thejohnfreeman
+- dimi309
+- valgur
+- jakobrieke
+- witte
+- liarokapisv
+- kielby
+- mayeut
+- CedricSchmeits
+- mwerminski
+- Kasurus
+- barynton
+- Daparrag
+- roalter
+- jsallay
+- lmife
+- granger35
+- bjoernrennfanz

.c3i/conan_v2_ready_references.yml

@@ -235,7 +235,6 @@ required_for_references:
 - opengl
 - openh264
 - openjpeg
-- openssl
 - opus
 - pcre
 - pcre2

.c3i/config_v1.yml

@@ -198,6 +198,7 @@ pod_size:
   large:
     - "pcl"
     - "duckdb"
+    - "ceres-solver"
   xlarge:
     - "llvm"
     - "opengv"

.c3i/reviewers.yml

@@ -81,3 +81,6 @@ reviewers:
   - user: "StellaSmith"
     type: "community"
     request_reviews: false
+  - user: "davidsanfal"
+    type: "team"
+    request_reviews: false

.github/workflows/alert-community.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: ./.github/actions/alert-community
         with:
           files: "docs/*/*"
-          reviewers: "@prince-chrismc @MartinDelille"
+          reviewers: "@prince-chrismc @MartinDelille @Croydon"
 
       - uses: ./.github/actions/alert-community
         with:

README.md

@@ -7,6 +7,13 @@ Conan Center Index is the source index of recipes of the [ConanCenter](https://c
 This repository includes a Continuous Integration system that will build automatically the Conan packages for the recipes submitted via
 [Pull Request](https://github.com/conan-io/conan-center-index/pulls).
 
+### Server Status
+
+The current Conan Center Index CI status can be found on https://status.conan.io/
+
+Any maintenance, outage or important event related to the CI will be informed there.
+
+
 ### Add ConanCenter remote
 
 ConanCenter remote is configured by default in any Conan client installation. If, for any reason, you need to add it manually, just execute:

docs/changelog.md

@@ -1,5 +1,25 @@
 # Changelog
 
+### 10-March-2023 - 19:55 CET
+
+- [feature] Add priority to pull requests
+- [hotfix] Avoid extra http requests to run automatic merge faster
+
+### 10-March-2023 - 13:15 CET
+
+- [hotfix] No longer update conan_v2_ready_references.yml automatically
+- [bugfix] Validate Green and clean PRs first when executing automatic merge CI job
+
+### 07-March-2023 - 17:05 CET
+
+- [hotfix] Automatic merge skips git conflicts
+- [hotfix] config label for "v2 ready" depends on PR author
+
+### 03-March-2023 - 11:05 CET
+
+- [feature] Update ready_v2_references.yml file automatically
+- [fix] Do not reuse the same build folder to avoid busy files
+
 ### 21-February-2023 - 17:22 CET
 
 - [fix] Fix bug with cppstd entry in configuration files.

docs/faqs.md

@@ -42,7 +42,8 @@ This section gathers the most common questions from the community related to pac
   * [How long can I be inactive before being removed from the authorized users list?](#how-long-can-i-be-inactive-before-being-removed-from-the-authorized-users-list)
   * [Can we add package which are parts of bigger projects like Boost?](#can-we-add-package-which-are-parts-of-bigger-projects-like-boost)
     * [Can I add my project which I will submit to Boost?](#can-i-add-my-project-which-i-will-submit-to-boost)
-  * [Can I add options that do not affect `package_id` or the package contents](#can-i-add-options-that-do-not-affect-package_id-or-the-package-contents)<!-- endToc -->
+  * [Can I add options that do not affect `package_id` or the package contents](#can-i-add-options-that-do-not-affect-package_id-or-the-package-contents)
+  * [Can I use full_package_mode for a requirement in my recipe?](#can-i-use-full_package_mode-for-a-requirement-in-my-recipe)<!-- endToc -->
 
 ## What is the policy on recipe name collisions?
 

docs/labels.md

@@ -9,6 +9,7 @@ special meaning:
 
   * [Bump dependencies](#bump-dependencies)
   * [Bump version](#bump-version)
+  * [C3I Conan2 Ready](#c3i-conan2-ready)
   * [Infrastructure](#infrastructure)
   * [Stale](#stale)
   * [Unexpected Error](#unexpected-error)
@@ -39,6 +40,16 @@ For now, only [SEMVER](https://semver.org/#semantic-versioning-200) and `<MAJOR.
 
 If the pull request modifies anything else, the label won't be assigned, we need to be very careful about false positives.
 
+## C3I Conan2 Ready
+
+Label [`c3i-conan2-ready`](https://github.com/conan-io/conan-center-index/pulls?q=is%3Aopen+is%3Apr+label%3A%22c3i-conan2-ready%22)
+is assigned by the bot to pull-requests that are just adding a new package references which passed by Conan v2 and are not listed in `.c3i/conan_v2_ready_references.yml`.
+This is a regression test, in case package is working with Conan v2, it can not be merged in a future pull request in case of failure.
+
+> These pull-requests will be merged right away without requiring any approval (CI and CLA checks must have passed).
+
+Only team members can open a pull request with these changes.
+
 ## Infrastructure
 
 Label [`infrastructure`](https://github.com/conan-io/conan-center-index/pulls?q=is%3Aopen+is%3Apr+label%3Ainfrastructure) is

docs/package_templates/cmake_package/all/conanfile.py

@@ -26,6 +26,8 @@ class PackageConan(ConanFile):
     homepage = "https://github.com/project/package"
     # no "conan" and project name in topics. Use topics from the upstream listed on GH
     topics = ("topic1", "topic2", "topic3")
+    # package_type should usually be "library" (if there is shared option)
+    package_type = "library"
     settings = "os", "arch", "compiler", "build_type"
     options = {
         "shared": [True, False],

docs/package_templates/header_only/all/conanfile.py

@@ -21,6 +21,7 @@ class PackageConan(ConanFile):
     # Do not put "conan" nor the project name in topics. Use topics from the upstream listed on GH
     # Keep 'header-only' as topic
     topics = ("topic1", "topic2", "topic3", "header-only")
+    package_type = "header-library"
     # Keep these or explain why it's not required for this particular case
     settings = "os", "arch", "compiler", "build_type"
     # Do not copy sources to build folder for header only projects, unless you need to apply patches

docs/package_templates/meson_package/all/conanfile.py

@@ -29,6 +29,8 @@ class PackageConan(ConanFile):
     homepage = "https://github.com/project/package"
     # no "conan" and project name in topics. Use topics from the upstream listed on GH
     topics = ("topic1", "topic2", "topic3")
+    # package_type should usually be "library" (if there is shared option)
+    package_type = "library"
     settings = "os", "arch", "compiler", "build_type"
     options = {
         "shared": [True, False],

docs/package_templates/msbuild_package/all/conanfile.py

@@ -19,6 +19,8 @@ class PackageConan(ConanFile):
     homepage = "https://github.com/project/package"
     # no "conan" and project name in topics. Use topics from the upstream listed on GH
     topics = ("topic1", "topic2", "topic3")
+    # package_type should usually be "library" (if there is shared option)
+    package_type = "library"
     settings = "os", "arch", "compiler", "build_type"
     options = {
         "shared": [True, False],

docs/package_templates/prebuilt_tool_package/all/conanfile.py

@@ -16,6 +16,7 @@ class PackageConan(ConanFile):
     homepage = "https://github.com/project/package"
     # no "conan"  and project name in topics. Use "pre-built" for tooling packages
     topics = ("topic1", "topic2", "topic3", "pre-built")
+    package_type = "application"
     settings = "os", "arch", "compiler", "build_type"  # even for pre-built executables
 
     # not needed but supress warning message from conan commands

recipes/aaf/all/conanfile.py

@@ -2,6 +2,7 @@
 from conan.tools.apple import fix_apple_shared_install_name, is_apple_os
 from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
 from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get
+from conan.tools.microsoft import is_msvc
 import os
 
 required_conan_version = ">=1.52.0"
@@ -45,7 +46,7 @@ def generate(self):
         tc = CMakeToolchain(self)
         if is_apple_os(self):
             tc.cache_variables["PLATFORM"] = "apple-clang"
-        elif self.settings.compiler == "Visual Studio":
+        elif is_msvc(self):
             tc.cache_variables["PLATFORM"] = "vc"
         else:
             tc.cache_variables["PLATFORM"] = str(self.settings.os)

recipes/accellera-uvm-systemc/all/conanfile.py

@@ -29,9 +29,11 @@ class UvmSystemC(ConanFile):
     def _source_subfolder(self):
         return "source_subfolder"
 
+    def requirements(self):
+        self.requires("systemc/2.3.3")
+
     def build_requirements(self):
         self.tool_requires("cmake/3.24.0")
-        self.tool_requires("systemc/2.3.3")
 
     def configure(self):
         if self.options.shared:

recipes/aws-c-auth/all/conanfile.py

@@ -1,19 +1,24 @@
 from conan import ConanFile
+from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
 from conan.tools.files import get, copy, rmdir
 from conan.tools.scm import Version
-from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
 
 import os
 
-required_conan_version = ">=1.47.0"
+required_conan_version = ">=1.53.0"
+
 
 class AwsCAuth(ConanFile):
     name = "aws-c-auth"
-    description = "C99 library implementation of AWS client-side authentication: standard credentials providers and signing."
+    description = (
+        "C99 library implementation of AWS client-side authentication: "
+        "standard credentials providers and signing."
+    )
     license = "Apache-2.0",
     url = "https://github.com/conan-io/conan-center-index"
     homepage = "https://github.com/awslabs/aws-c-auth"
     topics = ("aws", "amazon", "cloud", "authentication", "credentials", "providers", "signing")
+    package_type = "library"
     settings = "os", "arch", "compiler", "build_type"
     options = {
         "shared": [True, False],
@@ -30,33 +35,24 @@ def config_options(self):
 
     def configure(self):
         if self.options.shared:
-            try:
-                del self.options.fPIC
-            except Exception:
-                pass
-        try:
-            del self.settings.compiler.libcxx
-        except Exception:
-            pass
-        try:
-            del self.settings.compiler.cppstd
-        except Exception:
-            pass
+            self.options.rm_safe("fPIC")
+        self.settings.rm_safe("compiler.cppstd")
+        self.settings.rm_safe("compiler.libcxx")
 
     def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires("aws-c-common/0.8.2")
+        self.requires("aws-c-common/0.8.2", transitive_headers=True, transitive_libs=True)
         self.requires("aws-c-cal/0.5.13")
         if Version(self.version) < "0.6.17":
-            self.requires("aws-c-io/0.10.20")
-            self.requires("aws-c-http/0.6.13")
+            self.requires("aws-c-io/0.10.20", transitive_headers=True, transitive_libs=True)
+            self.requires("aws-c-http/0.6.13", transitive_headers=True, transitive_libs=True)
         else:
-            self.requires("aws-c-io/0.13.4")
-            self.requires("aws-c-http/0.6.22")
+            self.requires("aws-c-io/0.13.4", transitive_headers=True, transitive_libs=True)
+            self.requires("aws-c-http/0.6.22", transitive_headers=True, transitive_libs=True)
         if Version(self.version) >= "0.6.5":
-            self.requires("aws-c-sdkutils/0.1.3")
+            self.requires("aws-c-sdkutils/0.1.3", transitive_headers=True, transitive_libs=True)
 
     def source(self):
         get(self, **self.conan_data["sources"][self.version], destination=self.source_folder, strip_root=True)
@@ -83,11 +79,7 @@ def package(self):
     def package_info(self):
         self.cpp_info.set_property("cmake_file_name", "aws-c-auth")
         self.cpp_info.set_property("cmake_target_name", "AWS::aws-c-auth")
-
-        self.cpp_info.components["aws-c-auth-lib"].names["cmake_find_package"] = "aws-c-auth"
-        self.cpp_info.components["aws-c-auth-lib"].names["cmake_find_package_multi"] = "aws-c-auth"
-        self.cpp_info.components["aws-c-auth-lib"].set_property("cmake_target_name", "AWS::aws-c-auth")
-
+        # TODO: back to global scope once conan v1 support dropped
         self.cpp_info.components["aws-c-auth-lib"].libs = ["aws-c-auth"]
         self.cpp_info.components["aws-c-auth-lib"].requires = [
             "aws-c-common::aws-c-common-lib",
@@ -98,8 +90,11 @@ def package_info(self):
         if Version(self.version) >= "0.6.5":
             self.cpp_info.components["aws-c-auth-lib"].requires.append("aws-c-sdkutils::aws-c-sdkutils-lib")
 
-        # TODO: to remove in conan v2 once cmake_find_package_* generators removed
+        # TODO: to remove once conan v1 support dropped
         self.cpp_info.filenames["cmake_find_package"] = "aws-c-auth"
         self.cpp_info.filenames["cmake_find_package_multi"] = "aws-c-auth"
         self.cpp_info.names["cmake_find_package"] = "AWS"
         self.cpp_info.names["cmake_find_package_multi"] = "AWS"
+        self.cpp_info.components["aws-c-auth-lib"].names["cmake_find_package"] = "aws-c-auth"
+        self.cpp_info.components["aws-c-auth-lib"].names["cmake_find_package_multi"] = "aws-c-auth"
+        self.cpp_info.components["aws-c-auth-lib"].set_property("cmake_target_name", "AWS::aws-c-auth")

recipes/aws-c-auth/all/test_v1_package/CMakeLists.txt

@@ -1,10 +1,10 @@
 cmake_minimum_required(VERSION 3.1)
-project(test_package LANGUAGES C)
+project(test_v1_package)
+
+enable_testing()
 
 include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
 conan_basic_setup(TARGETS)
 
-find_package(aws-c-auth REQUIRED CONFIG)
-
-add_executable(${PROJECT_NAME} ../test_package/test_package.c)
-target_link_libraries(${PROJECT_NAME} PRIVATE AWS::aws-c-auth)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../test_package
+                 ${CMAKE_CURRENT_BINARY_DIR}/test_package)

recipes/b2/config.yml

@@ -43,3 +43,7 @@ versions:
     folder: portable
   "4.9.4":
     folder: portable
+  "4.9.5":
+    folder: portable
+  "4.9.6":
+    folder: portable

recipes/b2/portable/conandata.yml

@@ -53,3 +53,9 @@ sources:
   "4.9.4":
     url: "https://github.com/bfgroup/b2/releases/download/4.9.4/b2-4.9.4.tar.bz2"
     sha256: "1996d8098955ad3fdecab242d784afaef0fba80dd5d2ef0b3a41592e26772312"
+  "4.9.5":
+    url: "https://github.com/bfgroup/b2/releases/download/4.9.5/b2-4.9.5.tar.bz2"
+    sha256: "f81bea44601613f633d3311341f3f63594608537bf38d7073b877ec1edb2760a"
+  "4.9.6":
+    url: "https://github.com/bfgroup/b2/releases/download/4.9.6/b2-4.9.6.tar.bz2"
+    sha256: "10c1344c751fcf5a1f9ec6f52c02626cfbf78a4806f7817949b115e107bbbc5f"

recipes/benchmark/all/conanfile.py

@@ -18,6 +18,7 @@ class BenchmarkConan(ConanFile):
     homepage = "https://github.com/google/benchmark"
     topics = ("google", "microbenchmark")
 
+    package_type = "library"
     settings = "os", "arch", "compiler", "build_type"
     options = {
         "shared": [True, False],
@@ -53,15 +54,15 @@ def _cmake_new_enough(self, required_version):
             import re
             from io import StringIO
             output = StringIO()
-            self.run("cmake --version", output=output)
+            self.run("cmake --version", output)
             m = re.search(r'cmake version (\d+\.\d+\.\d+)', output.getvalue())
             return Version(m.group(1)) >= required_version
         except:
             return False
 
     def build_requirements(self):
         if Version(self.version) >= "1.7.1" and not self._cmake_new_enough("3.16.3"):
-            self.tool_requires("cmake/3.25.2")
+            self.tool_requires("cmake/3.25.3")
 
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)

recipes/boost-leaf/all/conanfile.py

@@ -19,10 +19,7 @@ class BoostLEAFConan(ConanFile):
               "header-only", "low-latency", "no-dependencies", "single-header")
     settings = "os", "compiler", "arch", "build_type"
     no_copy_source = True
-    deprecated = True
-
-    def configure(self):
-        raise ConanInvalidConfiguration(f"{self.ref} is deprecated in favor of Boost >=1.75.0")
+    deprecated = "boost"       
 
     def package_id(self):
         self.info.clear()
@@ -63,11 +60,10 @@ def lazy_lt_semver(v1, v2):
                 f"{self.name} {self.version} requires C++{self._min_cppstd}, which your compiler ({compiler}-{version}) does not support")
 
     def layout(self):
-        basic_layout(self)
+        basic_layout(self, src_folder="src")
 
     def source(self):
-        get(self, **self.conan_data["sources"][self.version],
-            destination=self.source_folder, strip_root=True)
+        get(self, **self.conan_data["sources"][self.version], strip_root=True)
 
     def package(self):
         copy(self, "LICENSE_1_0.txt", dst=os.path.join(