Skip to content

Commit

Permalink
Merge branch 'master' into openssl-bitcode
Browse files Browse the repository at this point in the history
  • Loading branch information
kletoz committed Jan 17, 2023
2 parents fee9eda + 8ef97f6 commit 3bf2df1
Show file tree
Hide file tree
Showing 1,556 changed files with 28,156 additions and 15,736 deletions.
26 changes: 26 additions & 0 deletions .c3i/authorized_users.yml
Original file line number Diff line number Diff line change
Expand Up @@ -994,3 +994,29 @@ authorized_users:
- kletoz
- agilemapper
- ZXfkSIE
- RubenRBS
- Alex-PLACET
- antekone
- ambroff
- tiolan
- MateuszMiekicki
- EricAtORS
- calebkiage
- bennyhuo
- ashuels
- jjcasmar
- kaipenglu
- ashley-b
- psmitsu
- Viatorus
- mkoviazin
- shtanko-sv
- larshg
- Wuqiqi123
- OzanCansel
- marlamb
- alexsmedin
- n-morales
- calebgray
- technic
- guillaume-michel
12 changes: 8 additions & 4 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.53.0
version: 1.56.0

artifactory:
url: "https://c3i.jfrog.io/c3i"
Expand Down Expand Up @@ -33,13 +33,18 @@ slack:

# Things related to Jenkins jobs
tasks:
conan_v2_run_export: true
conan_v2_run_export: false
write_comments: true
detailed_status_checks: true
update_labels: true
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
# Temporarily disable feedback from Conan v2
# cci_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
# merge_messages: true # Merge messages from the multibranch job waited for

# Profile configurations to build packages
configurations:
Expand Down Expand Up @@ -159,7 +164,7 @@ node_labels:
Windows:
x86_64:
"Visual Studio":
default: "windows20221024"
default: "windows20221212"
Macos:
x86_64:
"apple-clang":
Expand All @@ -184,7 +189,6 @@ pod_size:
large:
- "pcl"
- "duckdb"
- "cppfront"
xlarge:
- "llvm"
- "opengv"
5 changes: 3 additions & 2 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-staging-v2'

conan:
version: 2.0.0-pre
version: 2.0.0-beta7

artifactory:
url: "https://c3i.jfrog.io/c3i"
Expand All @@ -30,6 +30,7 @@ github:

# Things related to Jenkins jobs:
tasks:
feedback_title: "Conan v2 pipeline (informative, not required for merge)"
write_comments: false
detailed_status_checks: false
update_labels: false
Expand Down Expand Up @@ -87,7 +88,7 @@ node_labels:
Windows:
x86_64:
"msvc":
default: "windows20221024"
default: "windows20221212"
Macos:
x86_64:
"apple-clang":
Expand Down
3 changes: 3 additions & 0 deletions .c3i/reviewers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,6 @@ reviewers:
- user: "jwillikers"
type: "community"
request_reviews: false
- user: "RubenRBS"
type: "team"
request_reviews: false
8 changes: 0 additions & 8 deletions .github/ISSUE_TEMPLATE/center_conan_io.md

This file was deleted.

18 changes: 18 additions & 0 deletions .github/ISSUE_TEMPLATE/center_conan_io.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: 'ConanCenter: Web UI Bugs Or Requests'
description: Bugs or feature requests for the Web UI of ConanCenter at https://conan.io/center
title: '[conan.io/center] SHORT DESCRIPTION'
labels: 'conan.io/center'
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to submit a report.
**Please don't forget to update the issue title.**
- type: textarea
id: contents
attributes:
label: What is your problem/feature request?
description: Please be as specific as possible!
placeholder: Hi! I would like for ConanCenter to ...
validations:
required: true
156 changes: 81 additions & 75 deletions .github/ISSUE_TEMPLATE/package_bug.yml
Original file line number Diff line number Diff line change
@@ -1,81 +1,87 @@
name: 'Package: Bug Report'
description: 'Report a bug, something does not work as it supposed to'
description: 'Report a bug, something does not work as it is supposed to'
title: '[package] <LIBRARY-NAME>/<LIBRARY-VERSION>: SHORT DESCRIPTION'
labels: bug
body:
- type: textarea
attributes:
label: Description
description: What is not working? What were you expecting? Are there any workarounds?
value: |
_Please don't forget to update the issue title._
Missing profile or a short log will make extremely difficult to investigate your case or provide any help,
please, include all applicable information with details to help us reproduce your problem.
validations:
required: true
- type: markdown
attributes:
value: |
Thanks for taking the time to submit a report.
**Please don't forget to update the issue title.**
Include all applicable information to help us reproduce
- type: textarea
id: description
attributes:
label: Description
description: |
What is not working? What were you expecting? Are there any workarounds?
Remember that a missing profile or a short log will make extremely difficult
to investigate your case or provide any help, please be as specific as possible.
placeholder: Include all applicable information with details to help us reproduce your problem
validations:
required: true
- type: textarea
id: env
attributes:
label: Package and Environment Details
description: (Include every applicable attribute)
value: |
* Package Name/Version: **zlib/1.2.8**
* Operating System+version: **Linux Ubuntu 18.04**
* Compiler+version: **GCC 8**
* Docker image: **conanio/gcc8**
* Conan version: **conan 1.18.0**
* Python version: **Python 3.7.4**
placeholder: |
cat /etc/lsb-release | grep
gcc --version
docker info
cmake --version
conan -v
python3 --version
validations:
required: true
- type: textarea
id: profile
attributes:
label: Conan profile
description: Output of `conan profile show default` or `conan profile show <profile>` if a custom profile is in use
value: |
[settings]
os=Macos
os_build=Macos
arch=armv8
arch_build=armv8
compiler=apple-clang
compiler.version=14
compiler.libcxx=libc++
build_type=Release
[options]
[conf]
[build_requires]
[env]
validations:
required: true
- type: textarea
id: steps
attributes:
label: Steps to reproduce
description: Which commands did you run?
placeholder: conan install -r conancenter foobar/0.1.0@ -pr:b=default -pr:h=default
validations:
required: true
- type: textarea
id: logs
attributes:
label: Logs
description: Include/Attach the entire command output here.
value: |
<details><summary>Click to expand log</summary>
- type: textarea
attributes:
label: Package and Environment Details
description: (include every applicable attribute)
value: |
* Package Name/Version: **zlib/1.2.8**
* Operating System+version: **Linux Ubuntu 18.04**
* Compiler+version: **GCC 8**
* Docker image: **conanio/gcc8**
* Conan version: **conan 1.18.0**
* Python version: **Python 3.7.4**
placeholder: |
cat /etc/lsb-release | grep
gcc --version
docker info
cmake --version
conan -v
python3 --version
validations:
required: true
```
Put your log output here
```
- type: textarea
attributes:
label: Conan profile
description: output of `conan profile show default` or `conan profile show <profile>` if custom profile is in use
value: |
[settings]
os=Macos
os_build=Macos
arch=armv8
arch_build=armv8
compiler=apple-clang
compiler.version=14
compiler.libcxx=libc++
build_type=Release
[options]
[conf]
[build_requires]
[env]
validations:
required: true

- type: textarea
attributes:
label: Steps to reproduce
description: Which commands did you run?
value: conan install -r conancenter foobar/0.1.0@ -pr:b=default -pr:h=default
validations:
required: true

- type: textarea
attributes:
label: Logs
description: Include/Attach the entire command output here.
value: |
<details><summary>Click to expand log</summary>
```
Put your log output here
```
</details>
validations:
required: true
</details>
validations:
required: true
14 changes: 0 additions & 14 deletions .github/ISSUE_TEMPLATE/package_request.md

This file was deleted.

42 changes: 42 additions & 0 deletions .github/ISSUE_TEMPLATE/package_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: 'Package: Completely New Recipe'
description: If you would like to see a completely new recipe
title: '[request] <LIBRARY-NAME>/<LIBRARY-VERSION>'
labels: 'library request'
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to submit your request.
**Please don't forget to update the issue title.**
- type: input
id: package
attributes:
label: Package Name/Version
placeholder: cmake/3.25.1
validations:
required: true
- type: input
id: website
attributes:
label: Webpage
placeholder: https://cmake.org
validations:
required: true
- type: input
id: sources
attributes:
label: Source code
placeholder: https://github.com/Kitware/CMake
validations:
required: true
- type: textarea
id: description
attributes:
label: Description of the library/tool
description: |
Give us some context about this library/tool.
What is it about?
placeholder: |
CMake is an open-source, cross-platform family of tools designed to build, test and package software.
validations:
required: true
13 changes: 0 additions & 13 deletions .github/ISSUE_TEMPLATE/package_upstream_update.md

This file was deleted.

Loading

0 comments on commit 3bf2df1

Please sign in to comment.