Merge branch 'master' into qt

conan-io · Feb 13, 2024 · b2862aa · b2862aa
2 parents 34519bc + ad0b678
commit b2862aa
Show file tree

Hide file tree

Showing 371 changed files with 4,874 additions and 1,569 deletions.
diff --git a/.c3i/authorized_users.yml b/.c3i/authorized_users.yml
@@ -1266,7 +1266,6 @@ authorized_users:
 - wu-vincent
 - Inujel
 - keszegrobert
-- Mike-Solar
 - tomasz-wezyk
 - RaguzovaTatyana
 - st9007a
@@ -1275,3 +1274,17 @@ authorized_users:
 - anthonyliot
 - obnyis
 - johningve
+- stefansli
+- wgtmac
+- kevinAlbs
+- adamws
+- rob-baily
+- crhowell3
+- Jak-o-Shadows
+- MelamudMichael
+- Rodarin
+- philippun1
+- Kaaml
+- AlexanderBabansky
+- matthiasbuhl
+- cnicolaescu
diff --git a/.c3i/conan_v2_ready_references.yml b/.c3i/conan_v2_ready_references.yml
@@ -219,6 +219,7 @@ required_for_references:
 - cppdap
 - cppfront
 - cppitertools
+- cppkafka
 - cpprestsdk
 - cpptoml
 - cpptrace
@@ -342,9 +343,11 @@ required_for_references:
 - erikzenker-hsm
 - erkir
 - etc2comp
+- etcd-cpp-apiv3
 - eternal
 - ethash
 - etl
+- eventpp
 - evmc
 - exiv2
 - expat
@@ -379,6 +382,7 @@ required_for_references:
 - flex
 - flint
 - fltk
+- flux
 - fmi1
 - fmi2
 - fmi3
@@ -452,6 +456,7 @@ required_for_references:
 - gnu-config
 - gnulib
 - gnutls
+- godot-cpp
 - godot_headers
 - googleapis
 - gperf
@@ -526,8 +531,10 @@ required_for_references:
 - indicators
 - indirect_value
 - influxdb-cpp
+- influxdb-cxx
 - inih
 - inja
+- intel-ipsec-mb
 - intel-neon2sse
 - intx
 - inversify-cpp
@@ -797,6 +804,7 @@ required_for_references:
 - linux-syscall-support
 - litehtml
 - lksctp-tools
+- llama-cpp
 - llhttp
 - llvm-openmp
 - lmdb
@@ -827,6 +835,7 @@ required_for_references:
 - make
 - mapbox-geometry
 - mapbox-variant
+- mapbox-wagyu
 - mariadb-connector-c
 - marisa
 - matchit
@@ -855,6 +864,7 @@ required_for_references:
 - metall
 - metis
 - mfast
+- mgclient
 - mgs
 - microprofile
 - microservice-essentials
@@ -979,6 +989,7 @@ required_for_references:
 - opencore-amr
 - opencv
 - openddl-parser
+- opendis6
 - opene57
 - openexr
 - openfbx
@@ -1011,8 +1022,10 @@ required_for_references:
 - outcome
 - ozz-animation
 - p-ranav-glob
+- p7zip
 - paho-mqtt-c
 - paho-mqtt-cpp
+- pango
 - panzi-portable-endian
 - parallel-hashmap
 - parg
@@ -1042,6 +1055,7 @@ required_for_references:
 - picojson
 - picosha2
 - pipes
+- pistache
 - pixman
 - pkgconf
 - platform.converters
@@ -1165,6 +1179,7 @@ required_for_references:
 - safeint
 - sail
 - samurai
+- sassc
 - sbepp
 - sbp
 - scdoc
@@ -1237,6 +1252,7 @@ required_for_references:
 - sqlpp11
 - sqlpp11-connector-sqlite3
 - squirrel
+- srt
 - ssht
 - ssp
 - st_tree
@@ -1349,6 +1365,7 @@ required_for_references:
 - tsl-sparse-map
 - tuplet
 - turtle
+- tweenerspp
 - tweetnacl
 - twitch-native-ipc
 - twitchtv-libsoundtrackutil

diff --git a/.c3i/config_v1.yml b/.c3i/config_v1.yml
@@ -16,6 +16,7 @@ artifactory:
 github:
   reviewers: "reviewers.yml"
   authorized_users: "authorized_users.yml"
+  waitlist_users: "waitlist_users.yml"
 
 slack:
   credential_success_url: SLACK_SUCCESS_WEBHOOK_URL
@@ -29,6 +30,7 @@ tasks:
   automatic_merge:
     reviews_required_total: 2  # Reviews that a PR needs so it can be merged
     reviews_required_team: 1  # Reviews from the Conan team that a PR needs so it can be merged
+    reviews_required_bump: 1  # Total reviews required for a bump PR to be merged
     branches:  # PRs from automations that have these as base-branches will be merged automatically
       - "conan-io:action-doc-toc"
     # Requirements to merge a given pull-request:
@@ -55,6 +57,8 @@ tasks:
     write_comments: true
     detailed_status_checks: true
     update_labels: true
+    build_bump_deps_pr: false
+    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>
       timeout_seconds: 600  # Maximum time to wait for the multibranch job

diff --git a/.c3i/config_v2.yml b/.c3i/config_v2.yml
@@ -23,12 +23,14 @@ artifactory:
 github:
   reviewers: "reviewers.yml"
   authorized_users: "authorized_users.yml"
+  waitlist_users: "waitlist_users.yml"
 
 # Things related to Jenkins jobs:
 tasks:
   automatic_merge:
     reviews_required_total: 1000  # AutomaticMerge shouldn't run with this file, but just in case
     reviews_required_team: 1000  # AutomaticMerge shouldn't run with this file, but just in case
+    reviews_required_bump: 1000  # AutomaticMerge shouldn't run with this file, but just in case
   access_request:
       request_issue_url: https://github.com/conan-io/conan-center-index/issues/4
       max_inactivity_days: 0
@@ -47,6 +49,7 @@ tasks:
     detailed_status_checks: false
     write_comments: false
     update_labels: false
+    build_bump_deps_pr: false
     user_feedback:
       title: "Conan v2 pipeline"
       description: "> **Note**: Conan v2 builds are now mandatory. Please read our [discussion](https://github.com/conan-io/conan-center-index/discussions/19104) about it."

diff --git a/.c3i/waitlist_users.yml b/.c3i/waitlist_users.yml
@@ -0,0 +1,4 @@
+waitlist_users:
+- Mike-Solar
+- retroandchill
+- refactorTractor
diff --git a/.github/stale.yml b/.github/stale.yml
diff --git a/.github/workflows/on-push-do-doco.yml b/.github/workflows/on-push-do-doco.yml
@@ -22,7 +22,7 @@ jobs:
           --toc-level 5
       shell: bash
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v4
+      uses: peter-evans/create-pull-request@v6
       with:
         branch: bot/action-doc-toc
         commit-message: "[docs] Regenerate tables of contents"

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -0,0 +1,65 @@
+# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
+#
+# You can adjust the behavior by modifying this file.
+# For more information, see:
+# https://github.com/actions/stale
+name: Mark stale pull requests
+
+
+on:
+  schedule:
+  - cron: '34 6 * * *'
+
+jobs:
+  stale:
+    if: github.repository == 'conan-io/conan-center-index'
+
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      issues: read
+
+
+    steps:
+    - uses: actions/stale@v9
+      with:
+        # Do not make issues as stale
+        days-before-issue-stale: -1
+        # Number of days before stale PRs are closed
+        days-before-pr-stale: 30
+
+
+        # Do not close issues automatically
+        days-before-issue-close: -1
+        # Idle number of days before closing stale PRs
+        days-before-pr-close: 30
+
+        # process older PRs first
+        ascending: true
+
+        # Labels on PRs exempted from stale
+        exempt-pr-labels: blocked,infrastructure
+
+        # Label to apply on staled PRs
+        stale-pr-label: 'stale'
+        # Label to be removed when updating a PR
+        labels-to-remove-when-unstale: 'stale'
+
+        # Skip issues when having stale state
+        remove-issue-stale-when-updated: false
+        ignore-issue-updates: true
+
+
+        # Comment on the staled PRs
+        stale-pr-message: >
+            This pull request has been automatically marked as stale because it has not had
+            recent activity. It will be closed if no further activity occurs. Thank you
+            for your contributions.
+
+        # Comment on the staled PRs while closed
+        close-pr-message: >
+            This pull request has been automatically closed because it has not had
+            recent activity. Thank you for your contributions.
+
+        # Max number of operations per run
+        operations-per-run: 30
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,5 +1,10 @@
 # Changelog
 
+### 07-February-2024 - 15:43 CET
+
+- [feature] Add waiting list for new collaborators that are not found in access request issue.
+- [feature] Skip building bump dependencies PRs by default. It will require manual CI trigger.
+
 ### 24-January-2024 - 12:13 CET
 
 - [feature] Update Conan 1.x branch to version 1.62.0

diff --git a/docs/faqs.md b/docs/faqs.md
@@ -41,6 +41,7 @@ This section gathers the most common questions from the community related to pac
   * [How to watch only specific recipes?](#how-to-watch-only-specific-recipes)
   * [Is it possible to disable Pylint?](#is-it-possible-to-disable-pylint)
   * [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)
+  * [What happens in case I change my user name?](#what-happens-in-case-i-change-my-user-name)
   * [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)
@@ -431,6 +432,14 @@ difficult to understand [linter errors](linters.md), please comment on your pull
 
 Please, read [Inactivity and user removal section](adding_packages/README.md#inactivity-and-user-removal).
 
+## What happens in case I change my user name?
+
+Your Github user name is used to identify you in the authorized users list. If you change your user name, you will need to communicate or, in the #4, or opening a new issue.
+Otherwise, the CI will not be able to find you and will not build your pull requests.
+In case you change you user name just after asking for authorization in #4, please, communicate the change in the same issue.
+Users are revised before being added to the authorized users list, in case the user name is not found in #4, it will be asked in the pull request `Update authorized users list`.
+If the user does not answer, the user will be moved to the `waitlist_users.yml` file, until having further communication.
+
 ## Can we add package which are parts of bigger projects like Boost?
 
 Sadly no. There have been many efforts in the past and we feel it's not sustainable given the number of combinations of libraries and version.

diff --git a/recipes/7bitdi/all/conandata.yml b/recipes/7bitdi/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "2.1.0":
+    url: "https://github.com/7bitcoder/7bitDI/archive/refs/tags/v2.1.0.tar.gz"
+    sha256: "54edceb4f90bf652126310ca0b78150d05a02d7081cef3c9ccaba5f4dd112935"
   "2.0.0":
     url: "https://github.com/7bitcoder/7bitDI/archive/refs/tags/v2.0.0.tar.gz"
     sha256: "ae6d01c677b928a9c0979b9b2395692f9a3d876e07189d9b191e7b55c13d9ef4"

diff --git a/recipes/7bitdi/config.yml b/recipes/7bitdi/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "2.1.0":
+    folder: all
   "2.0.0":
     folder: all
   "1.0.0":

diff --git a/recipes/asio-grpc/all/conandata.yml b/recipes/asio-grpc/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "2.9.2":
+    url: "https://github.com/Tradias/asio-grpc/archive/refs/tags/v2.9.2.tar.gz"
+    sha256: "a025587278b3332f4c5dd0464b3d5313fbecb89fc58a6ec1d611f693d6b51ef2"
   "2.7.0":
     url: "https://github.com/Tradias/asio-grpc/archive/refs/tags/v2.7.0.tar.gz"
     sha256: "a4a3deeabbdef37a8e7238e25b6f26b63071151c4b49e1f2f86c528da54eed79"