Skip to content

Commit

Permalink
Merge branch 'conan-io:master' into openssl
Browse files Browse the repository at this point in the history
  • Loading branch information
klausholstjacobsen authored Feb 20, 2024
2 parents 4610682 + a1c6c89 commit 2708279
Show file tree
Hide file tree
Showing 363 changed files with 6,098 additions and 3,405 deletions.
13 changes: 11 additions & 2 deletions .c3i/authorized_users.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1266,7 +1266,6 @@ authorized_users:
- wu-vincent
- Inujel
- keszegrobert
- Mike-Solar
- tomasz-wezyk
- RaguzovaTatyana
- st9007a
Expand All @@ -1278,6 +1277,16 @@ authorized_users:
- stefansli
- wgtmac
- kevinAlbs
- retroandchill
- adamws
- rob-baily
- crhowell3
- Jak-o-Shadows
- MelamudMichael
- Rodarin
- philippun1
- Kaaml
- AlexanderBabansky
- matthiasbuhl
- cnicolaescu
- mmomtchev
- ChristianHeinigk
11 changes: 11 additions & 0 deletions .c3i/conan_v2_ready_references.yml
Original file line number Diff line number Diff line change
Expand Up @@ -343,9 +343,11 @@ required_for_references:
- erikzenker-hsm
- erkir
- etc2comp
- etcd-cpp-apiv3
- eternal
- ethash
- etl
- eventpp
- evmc
- exiv2
- expat
Expand Down Expand Up @@ -454,6 +456,7 @@ required_for_references:
- gnu-config
- gnulib
- gnutls
- godot-cpp
- godot_headers
- googleapis
- gperf
Expand Down Expand Up @@ -528,8 +531,10 @@ required_for_references:
- indicators
- indirect_value
- influxdb-cpp
- influxdb-cxx
- inih
- inja
- intel-ipsec-mb
- intel-neon2sse
- intx
- inversify-cpp
Expand Down Expand Up @@ -799,6 +804,7 @@ required_for_references:
- linux-syscall-support
- litehtml
- lksctp-tools
- llama-cpp
- llhttp
- llvm-openmp
- lmdb
Expand Down Expand Up @@ -829,6 +835,7 @@ required_for_references:
- make
- mapbox-geometry
- mapbox-variant
- mapbox-wagyu
- mariadb-connector-c
- marisa
- matchit
Expand Down Expand Up @@ -857,6 +864,7 @@ required_for_references:
- metall
- metis
- mfast
- mgclient
- mgs
- microprofile
- microservice-essentials
Expand Down Expand Up @@ -981,6 +989,7 @@ required_for_references:
- opencore-amr
- opencv
- openddl-parser
- opendis6
- opene57
- openexr
- openfbx
Expand Down Expand Up @@ -1013,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
Expand Down
1 change: 1 addition & 0 deletions .c3i/config_v1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 Down
1 change: 1 addition & 0 deletions .c3i/config_v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ artifactory:
github:
reviewers: "reviewers.yml"
authorized_users: "authorized_users.yml"
waitlist_users: "waitlist_users.yml"

# Things related to Jenkins jobs:
tasks:
Expand Down
4 changes: 4 additions & 0 deletions .c3i/waitlist_users.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
waitlist_users:
- Mike-Solar
- retroandchill
- refactorTractor
61 changes: 0 additions & 61 deletions .github/stale.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/on-push-do-doco.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
65 changes: 65 additions & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions docs/changelog.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 9 additions & 0 deletions docs/faqs.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions recipes/7bitdi/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 2 additions & 0 deletions recipes/7bitdi/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"2.1.0":
folder: all
"2.0.0":
folder: all
"1.0.0":
Expand Down
17 changes: 15 additions & 2 deletions recipes/autoconf/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
sources:
"2.72":
url: "https://ftpmirror.gnu.org/autoconf/autoconf-2.72.tar.xz"
sha256: "ba885c1319578d6c94d46e9b0dceb4014caafe2490e437a0dbca3f270a223f5a"
"2.71":
sha256: "431075ad0bf529ef13cb41e9042c542381103e80015686222b8a9d4abef42a1c"
url: "https://ftp.gnu.org/gnu/autoconf/autoconf-2.71.tar.gz"
url: "https://ftpmirror.gnu.org/autoconf/autoconf-2.71.tar.xz"
sha256: "f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4"
patches:
"2.72":
- patch_file: "patches/2.72-0001-relocatable-autoconf.patch"
patch_description: "Replace instances where absolute paths are embedded the generated files"
patch_type: "conan"
- patch_file: "patches/2.71-0002-no-perl-path-in-shebang.patch"
patch_description: "Avoid build machine's perl path to be embedded the generated files"
patch_type: "conan"
- patch_file: "patches/2.72-0003-disable-man-regeneration.patch"
patch_description: "Disable man regeneration"
patch_type: "conan"
"2.71":
- patch_file: "patches/2.71-0001-relocatable-autoconf.patch"
patch_description: "Replace instances where absolute paths are embedded the generated files"
Expand Down
6 changes: 0 additions & 6 deletions recipes/autoconf/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,6 @@ def package_info(self):
self.cpp_info.includedirs = []
self.cpp_info.resdirs = ["res"]

# TODO: These variables can be removed since the scripts now locate the resources
# relative to themselves.
dataroot_path = os.path.join(self.package_folder, "res", "autoconf")
self.buildenv_info.define_path("AC_MACRODIR", dataroot_path)
self.buildenv_info.define_path("autom4te_perllibdir", dataroot_path)

bin_path = os.path.join(self.package_folder, "bin")
self.buildenv_info.define_path("AUTOCONF", os.path.join(bin_path, "autoconf"))
self.buildenv_info.define_path("AUTORECONF", os.path.join(bin_path, "autoreconf"))
Expand Down
Loading

0 comments on commit 2708279

Please sign in to comment.