Skip to content

Commit

Permalink
Merge branch 'master' into migrate/verilator
Browse files Browse the repository at this point in the history
  • Loading branch information
AbrilRBS authored Oct 6, 2024
2 parents b2e8c2d + 5ba4f30 commit ef59aed
Show file tree
Hide file tree
Showing 5,873 changed files with 114,175 additions and 82,640 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
234 changes: 203 additions & 31 deletions .c3i/authorized_users.yml

Large diffs are not rendered by default.

321 changes: 321 additions & 0 deletions .c3i/conan_v2_ready_references.yml

Large diffs are not rendered by default.

56 changes: 26 additions & 30 deletions .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.61.0
version: 1.65.0

artifactory:
url: "https://c3i.jfrog.io/c3i"
Expand All @@ -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
Expand All @@ -29,14 +30,12 @@ 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:
# * check_runs refers to notifications from GH actions
# * status_checks refers to notifications coming from external tools (Jenkins, CLA,...)
check_runs:
- name: "Lint changed files (YAML files)"
- name: "Lint changed conanfile.py (v2 migration)"
status_checks:
- name: "license/cla"
- name: "continuous-integration/jenkins/pr-merge"
Expand All @@ -49,11 +48,15 @@ tasks:
- boost
- qt
- llvm
parallel_strategy: unlimited
cci:
conan_v2_run_export: false
write_comments: true
detailed_status_checks: 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>
timeout_seconds: 600 # Maximum time to wait for the multibranch job
Expand All @@ -69,49 +72,42 @@ tasks:
validate_infrastructure:
macos_executors: 2
windows_executors: 4
open_docs_pull-request: true
create_docs_pull-request: true

# Profile configurations to build packages
configurations:
- id: linux-gcc
epochs: [20211221, 20220120, 20230606]
hrname: "Linux, GCC"
- id: linux-gcc-legacy
hrname: "Linux, GCC-legacy"
content:
- os: ["Linux"]
arch: ["x86_64"]
compiler:
- "gcc":
compiler.libcxx: [ "libstdc++11" ]
compiler.version: ["5", "7", "9", "10", "11"]
compiler.version: ["5", "7", "9"]
build_type: ["Release"]
- id: linux-gcc11
hrname: "Linux, GCC11"
content:
- os: ["Linux"]
arch: ["x86_64"]
compiler:
- "gcc":
compiler.libcxx: [ "libstdc++11" ]
compiler.version: ["11"]
build_type: ["Release", "Debug"]
- id: linux-clang
epochs: [20211221, 20220120, 20230606]
hrname: "Linux, Clang"
content:
- os: ["Linux"]
arch: ["x86_64"]
compiler:
- "clang":
compiler.libcxx: ["libstdc++", "libc++"]
compiler.version: ["12", "13"]
build_type: ["Release", "Debug"]
- id: macos-clang
epochs: [20220120, 20230606]
hrname: "macOS, Clang"
content:
- os: [ "Macos" ]
arch: [ "x86_64" ]
compiler:
- "apple-clang":
compiler.version: [ "13.0" ]
compiler.libcxx: [ "libc++" ]
build_type: [ "Release", "Debug" ]
compiler.version: ["13"]
build_type: ["Release"]
- id: macos-m1-clang
epochs: [20220120, 20230606]
hrname: "macOS, Clang (M1/arm64)"
build_profile:
os: "Macos"
arch: "x86_64"
content:
- os: [ "Macos" ]
arch: [ "armv8" ]
Expand All @@ -121,7 +117,6 @@ configurations:
compiler.libcxx: [ "libc++" ]
build_type: [ "Release", "Debug" ]
- id: windows-visual_studio
epochs: [0, 20211221, 20220120, 20230606]
hrname: "Windows, Visual Studio"
content:
- os: [ "Windows" ]
Expand Down Expand Up @@ -167,6 +162,7 @@ pod_size:
large:
- "duckdb"
- "ceres-solver"
- "simd"
xlarge:
- "llvm"
- "opengv"
Expand Down
25 changes: 14 additions & 11 deletions .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.0.12
version: 2.7.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 All @@ -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
Expand All @@ -40,32 +42,35 @@ tasks:
- boost
- qt
- llvm
- gstreamer
parallel_strategy: unlimited
cci:
conan_v2_run_export: false
detailed_status_checks: false
detailed_status_checks: true
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."
regression: "> **Regression**: Conan v2 builds are mandatory and they are required for the PR to be merged, because this recipe worked with Conan v2 previously."
text_on_failure: "The v2 pipeline failed. Please, review the errors and note this is required for pull requests to be merged. In case this recipe is still not ported to Conan 2.x, please, ping `@conan-io/barbarians` on the PR and we will help you."
collapse_on_success: false
collapse_on_failure: true
collapse_on_failure: false
list_packages:
update_yaml_list_path: ".c3i/conan_v2_ready_references"
update_yaml_list_key: "required_for_references"
promote_packages:
additional_repo_target: "conan-center-v2-only"
scheduled_export_check:
report_issue_url: https://github.com/conan-io/conan-center-index/issues/15557
report_issue_append: false
validate_infrastructure:
macos_executors: 2
windows_executors: 4
open_docs_pull-request: false
create_docs_pull-request: false

configurations:
- id: linux-gcc
epochs: [0, 20211221, 20220120, 20220628, 20230606]
hrname: "Linux, GCC"
build_profile:
os: "Linux"
Expand All @@ -78,10 +83,10 @@ configurations:
compiler.version: ["11"]
build_type: ["Release"]
- id: macos-clang
epochs: [0, 20211221, 20220120, 20220628, 20230606]
hrname: "macOS, Clang"
build_profile:
os: "Macos"
arch: "armv8"
content:
- os: [ "Macos" ]
arch: [ "x86_64" ]
Expand All @@ -91,11 +96,10 @@ configurations:
compiler.libcxx: [ "libc++" ]
build_type: [ "Release"]
- id: macos-m1-clang
epochs: [0, 20211221, 20220120, 20220628, 20230606]
hrname: "macOS M1, Clang"
build_profile:
os: "Macos"
arch: "x86_64"
arch: "armv8"
content:
- os: [ "Macos" ]
arch: [ "armv8" ]
Expand All @@ -105,7 +109,6 @@ configurations:
compiler.libcxx: [ "libc++" ]
build_type: [ "Release"]
- id: windows-msvc
epochs: [20230606]
hrname: "Windows, MSVC"
build_profile:
os: "Windows"
Expand All @@ -124,7 +127,7 @@ cppstd:
apple-clang:
"13": ["17", "gnu17", "20", "gnu20"]
gcc:
"11": ["17", "gnu17", "20", "gnu20"]
"11": ["17", "gnu17", "20", "gnu20", "23", "gnu23"]
msvc:
"192": ["14", "17", "20"]
"193": ["14", "17", "20"]
Expand Down
52 changes: 32 additions & 20 deletions .c3i/reviewers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,45 @@ reviewers:
- user: "lasote"
type: "team"
request_reviews: false
- user: "jgsogo"
type: "community"
request_reviews: false
- user: "czoido"
type: "team"
request_reviews: false
- user: "memsharded"
type: "team"
request_reviews: false
- user: "SSE4"
type: "community"
request_reviews: false
- user: "uilianries"
type: "team"
request_reviews: true
- user: "jcar87"
type: "team"
request_reviews: true
- user: "franramirez688"
type: "team"
request_reviews: true
- user: "AbrilRBS"
type: "team"
request_reviews: true
- user: "davidsanfal"
type: "team"
request_reviews: false
- user: "juansblanco"
type: "team"
request_reviews: false
- user: "perseoGI"
type: "team"
request_reviews: false
- user: "ErniGH"
type: "team"
request_reviews: false
########
### Begin community reviewers
########
- user: "jgsogo"
type: "community"
request_reviews: false
- user: "SSE4"
type: "community"
request_reviews: false
- user: "madebr"
type: "community"
request_reviews: false
Expand All @@ -33,9 +57,6 @@ reviewers:
- user: "theirix"
type: "community"
request_reviews: false
- user: "ericLemanissier"
type: "community"
request_reviews: false
- user: "prince-chrismc"
type: "community"
request_reviews: false
Expand All @@ -57,21 +78,12 @@ reviewers:
- user: "MartinDelille"
type: "community"
request_reviews: false
- user: "jcar87"
type: "team"
request_reviews: true
- user: "franramirez688"
type: "team"
request_reviews: true
- user: "paulocoutinhox"
type: "community"
request_reviews: false
- user: "jwillikers"
type: "community"
request_reviews: false
- user: "RubenRBS"
type: "team"
request_reviews: true
- user: "System-Arch"
type: "community"
request_reviews: false
Expand All @@ -81,6 +93,6 @@ reviewers:
- user: "StellaSmith"
type: "community"
request_reviews: false
- user: "davidsanfal"
type: "team"
- user: "valgur"
type: "community"
request_reviews: false
12 changes: 12 additions & 0 deletions .c3i/waitlist_users.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
waitlist_users:
- Mike-Solar
- retroandchill
- refactorTractor
- jjbel
- synaptics-lspintzyk
- wer14
- connor-i-clark
- NeXuS4Developer
- sabapathim
- pixelsoba
- liss-h
17 changes: 11 additions & 6 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
Specify library name and version: **lib/1.0**

<!-- This is also a good place to share with all of us **why you are submitting this PR** (specially if it is a new addition to ConanCenter): is it a dependency of other libraries you want to package? Are you the author of the library? Thanks! -->
### Summary
Changes to recipe: **lib/[version]**

#### Motivation
<!-- Please explain why this PR is needed, if it is a bugfix, please describe the bug or link to an existing issue. -->

#### Details
<!-- Explanation of the changes in the PR - this greatly simplifies the task of the reviewing team! -->

---

- [ ] I've read the [contributing guidelines](https://github.com/conan-io/conan-center-index/blob/master/CONTRIBUTING.md).
- [ ] I've used a [recent](https://github.com/conan-io/conan/releases/latest) Conan client version close to the [currently deployed](https://github.com/conan-io/conan-center-index/blob/master/.c3i/config_v1.yml#L6).
- [ ] I've tried at least one configuration locally with the [conan-center hook](https://github.com/conan-io/hooks.git) activated.
---
- [ ] Read the [contributing guidelines](https://github.com/conan-io/conan-center-index/blob/master/CONTRIBUTING.md)
- [ ] Checked that this PR is not a duplicate: [list of PRs by recipe](https://github.com/conan-io/conan-center-index/discussions/24240)
- [ ] Tested locally with at least one configuration using a recent version of Conan
31 changes: 0 additions & 31 deletions .github/actions/alert-community/action.yml

This file was deleted.

Loading

0 comments on commit ef59aed

Please sign in to comment.