Skip to content

Commit

Permalink
Merge branch 'master' of github.com:conan-io/conan-center-index
Browse files Browse the repository at this point in the history
  • Loading branch information
partiallyderived committed Nov 3, 2022
2 parents 19b956f + db2c751 commit 9677726
Show file tree
Hide file tree
Showing 1,172 changed files with 20,361 additions and 9,247 deletions.
20 changes: 20 additions & 0 deletions .c3i/authorized_users.yml
Original file line number Diff line number Diff line change
Expand Up @@ -943,3 +943,23 @@ authorized_users:
- "vince-cheung"
- "mariopil"
- "PikachuHyA"
- "System-Arch"
- "sorny92"
- "cubanpit"
- "winterz"
- "Kidsunbo"
- "antony-jr"
- "tankeco"
- "ElliotMugner"
- "jfaust"
- "morningstar1"
- "lrineau"
- "jwidauer"
- "partiallyderived"
- "Ahajha"
- "mjimenofluendo"
- "jiaoew1991"
- "ramin-raeisi"
- "schoetbi"
- "psyinf"
- "Novakov"
4 changes: 2 additions & 2 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.52.0
version: 1.53.0

artifactory:
url: "https://c3i.jfrog.io/c3i"
Expand Down Expand Up @@ -159,7 +159,7 @@ node_labels:
Windows:
x86_64:
"Visual Studio":
default: "windows20220803"
default: "windows20221024"
Macos:
x86_64:
"apple-clang":
Expand Down
2 changes: 1 addition & 1 deletion .c3i/config_v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ node_labels:
Windows:
x86_64:
"msvc":
default: "windows20220803"
default: "windows20221024"
Macos:
x86_64:
"apple-clang":
Expand Down
4 changes: 2 additions & 2 deletions .c3i/reviewers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ reviewers:
type: "team"
request_reviews: false
- user: "jgsogo"
type: "team"
request_reviews: true
type: "community"
request_reviews: false
- user: "czoido"
type: "team"
request_reviews: false
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/linter-conan-v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
uses: mikefarah/yq@master
with:
cmd: yq '.conan.version' '.c3i/config_v1.yml'
- uses: actions/setup-python@v3
- uses: actions/setup-python@v4
if: steps.changed_files.outputs.any_changed == 'true'
with:
python-version: ${{ env.PYVER }}
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
uses: mikefarah/yq@master
with:
cmd: yq '.conan.version' '.c3i/config_v1.yml'
- uses: actions/setup-python@v3
- uses: actions/setup-python@v4
if: steps.changed-files.outputs.any_changed == 'true'
with:
python-version: ${{ env.PYVER }}
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
uses: mikefarah/yq@master
with:
cmd: yq '.conan.version' '.c3i/config_v1.yml'
- uses: actions/setup-python@v3
- uses: actions/setup-python@v4
if: steps.changed-files.outputs.any_changed == 'true'
with:
python-version: ${{ env.PYVER }}
Expand Down
59 changes: 45 additions & 14 deletions .github/workflows/linter-yaml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ on:
env:
PYTHONPATH: ${{github.workspace}}
PYVER: "3.8"
CONFIG_FILES_PATH: "recipes/**/config.yml"
CONANDATA_FILES_PATH: "recipes/**/**/conandata.yml"
CONFIG_FILES_PATH: "recipes/*/config.yml"
CONANDATA_FILES_PATH: "recipes/*/*/conandata.yml"

jobs:
test_linter:
Expand All @@ -26,23 +26,42 @@ jobs:
files: |
linter/**
- uses: actions/setup-python@v3
- uses: actions/setup-python@v4
if: steps.changed_files.outputs.any_changed == 'true'
with:
python-version: ${{ env.PYVER }}

- name: Install dependencies
if: steps.changed_files.outputs.any_changed == 'true'
run: pip install yamllint
run: pip install yamllint strictyaml argparse

- name: Run linter (config.yml)
if: steps.changed_files.outputs.any_changed == 'true' && always()
run: yamllint --config-file linter/yamllint_rules.yml -f parsable ${{ env.CONFIG_FILES_PATH }}
run: |
echo "::add-matcher::linter/yamllint_matcher.json"
yamllint --config-file linter/yamllint_rules.yml -f standard ${{ env.CONFIG_FILES_PATH }}
echo "::remove-matcher owner=yamllint_matcher::"
- name: Run schema check (config.yml)
if: steps.changed_files.outputs.any_changed == 'true' && always()
run: |
for file in ${{ env.CONFIG_FILES_PATH }}; do
python3 linter/config_yaml_linter.py ${file}
done
- name: Run linter (conandata.yml)
if: steps.changed_files.outputs.any_changed == 'true' && always()
run: yamllint --config-file linter/yamllint_rules.yml -f parsable ${{ env.CONANDATA_FILES_PATH }}
run: |
echo "::add-matcher::linter/yamllint_matcher.json"
yamllint --config-file linter/yamllint_rules.yml -f standard ${{ env.CONANDATA_FILES_PATH }}
echo "::remove-matcher owner=yamllint_matcher::"
- name: Run schema check (conandata.yml)
if: steps.changed_files.outputs.any_changed == 'true' && always()
run: |
for file in ${{ env.CONANDATA_FILES_PATH }}; do
python3 linter/conandata_yaml_linter.py ${file}
done
lint_pr_files:
# Lint files modified in the pull_request
Expand All @@ -53,12 +72,12 @@ jobs:
with:
fetch-depth: 2

- uses: actions/setup-python@v3
- uses: actions/setup-python@v4
with:
python-version: ${{ env.PYVER }}

- name: Install dependencies
run: pip install yamllint
run: pip install yamllint strictyaml argparse

## Work on config.yml files
- name: Get changed files (config)
Expand All @@ -68,12 +87,18 @@ jobs:
with:
files: |
${{ env.CONFIG_FILES_PATH }}
- name: Run linter (config.yml)
if: steps.changed_files_config.outputs.any_changed == 'true' && always()
run: |
echo "::add-matcher::linter/yamllint_matcher.json"
for file in ${{ steps.changed_files_config.outputs.all_changed_files }}; do
yamllint --config-file linter/yamllint_rules.yml ${file}
yamllint --config-file linter/yamllint_rules.yml -f standard ${file}
done
echo "::remove-matcher owner=yamllint_matcher::"
for file in ${{ steps.changed_files_conandata.outputs.all_changed_files }}; do
python3 linter/config_yaml_linter.py ${file}
done
## Work on conandata.yml files
Expand All @@ -84,10 +109,16 @@ jobs:
with:
files: |
${{ env.CONANDATA_FILES_PATH }}
- name: Run linter (conandata.yml)
if: steps.changed_files_conandata.outputs.any_changed == 'true' && always()
run: |
echo "::add-matcher::linter/yamllint_matcher.json"
for file in ${{ steps.changed_files_conandata.outputs.all_changed_files }}; do
yamllint --config-file linter/yamllint_rules.yml -f standard ${file}
done
echo "::remove-matcher owner=yamllint_matcher::"
for file in ${{ steps.changed_files_conandata.outputs.all_changed_files }}; do
yamllint --config-file linter/yamllint_rules.yml ${file}
python3 linter/conandata_yaml_linter.py ${file}
done
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@v3
uses: peter-evans/create-pull-request@v4
with:
branch: bot/action-doc-toc
commit-message: "[docs] Regenerate tables of contents"
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Conan specific
test_package/build/
test_package/test_output/
conan.lock
conanbuildinfo.txt
conaninfo.txt
Expand Down
22 changes: 22 additions & 0 deletions docs/changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,27 @@
# Changelog

### 27-October-2022 - 15:18 CEST

- [feature] Add under maintenance check to AccessRequest and ScheduledExportCheck jobs.
- [feature] AccessRequest: Remove inactive users.
- [feature] Accept Major.Minor as bump version.
- [feature] Add message title to gihtub comments.
- [fix] Update maintainers list and fix output.
- [fix] Remove dummy files from tests.
- [fix] Make sure contributors are not removed in Access request PR.

### 17-October-2022 - 10:33 CEST

- [feature] Improve management of GitHub labels on pull requests.
- [feature] New EpochsSummary job to show epoch status for each reference.
- [feature] Save bot comments as labels as job artifacts for easier user feedback.
- [feature] Ability to wait for a job and merge bot messages from another pipeline: Allows to provide feedback to users in PRs from the Conan v2 pipeline in the future.
- [feature] Add timeout to AutomaticMerge job.
- [feature] Add note about Windows SDK on supported platforms documentation.
- [fix] Fix getting package IDs from Artifactory in the Conan v2 pipeline.
- [fix] Bump dependencies pull requests should only consider modified comments.
- [fix] ValidateInfrastructure job parameter for macos executors.

### 20-September-2022 - 14:27 CEST

- [feature] Handle scenarios where some files are removed.
Expand Down
Loading

0 comments on commit 9677726

Please sign in to comment.