From 8aba83847dccb278b3fe07112ef8cb0b93c90f1c Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 21 Feb 2023 16:15:56 +0100 Subject: [PATCH] [config] Add Conan v2 build configs with cppstd & conan v2 ready references list (#16209) --- .c3i/conan_v2_ready_references.yml | 2 ++ .c3i/config_v1.yml | 10 ---------- .c3i/config_v2.yml | 32 +++++++++++++++++++++--------- 3 files changed, 25 insertions(+), 19 deletions(-) create mode 100644 .c3i/conan_v2_ready_references.yml diff --git a/.c3i/conan_v2_ready_references.yml b/.c3i/conan_v2_ready_references.yml new file mode 100644 index 0000000000..0258ca726f --- /dev/null +++ b/.c3i/conan_v2_ready_references.yml @@ -0,0 +1,2 @@ +required_for_references: + - zlib diff --git a/.c3i/config_v1.yml b/.c3i/config_v1.yml index 5836848d56..fab3737410 100644 --- a/.c3i/config_v1.yml +++ b/.c3i/config_v1.yml @@ -16,16 +16,6 @@ artifactory: github: reviewers: "reviewers.yml" authorized_users: "authorized_users.yml" - check_runs: - - "Lint changed files (YAML files)" - - "Lint changed conanfile.py (v2 migration)" - -# Requirements to merge a given pull-request: -# * status_checks refers to notifications coming from external tools (Jenkins, CLA,...) -# * check_runs refers to notifications from GH actions -status_checks: - - "license/cla" - - "continuous-integration/jenkins/pr-merge" slack: credential_success_url: SLACK_SUCCESS_WEBHOOK_URL diff --git a/.c3i/config_v2.yml b/.c3i/config_v2.yml index 501b968f16..3cc16c2589 100644 --- a/.c3i/config_v2.yml +++ b/.c3i/config_v2.yml @@ -1,6 +1,6 @@ --- -# Configuration for `https://github.com/conan-io/conan-center-index-staging` repository (using Conan v2) -id: 'conan-io/conan-center-index-staging-v2' +# Configuration for `https://github.com/conan-io/conan-center-index` repository (using Conan v2) +id: 'conan-io/conan-center-index' conan: version: 2.0.0-beta10 @@ -17,13 +17,6 @@ github: reviewers: "reviewers.yml" authorized_users: "authorized_users.yml" -# Requirements to merge a given pull-request: -# * status_checks refers to notifications coming from external tools (Jenkins, CLA,...) -# * check_runs refers to notifications from GH actions -#status_checks: -# - "license/cla" -# - "continuous-integration/jenkins/pr-merge" - #slack: # credential_success_url: SLACK_SUCCESS_WEBHOOK_URL # ceredential_errors_url: SLACK_FAILURE_WEBHOOK_URL @@ -78,6 +71,19 @@ configurations: compiler.version: ["13" ] compiler.libcxx: [ "libc++" ] build_type: [ "Release"] + - id: configs/macos-m1-clang + epochs: [0, 20220628] + hrname: "macOS M1, Clang" + build_profile: + os: "Macos" + content: + - os: [ "Macos" ] + arch: [ "armv8" ] + compiler: + - "apple-clang": + compiler.version: ["13" ] + compiler.libcxx: [ "libc++" ] + build_type: [ "Release"] - id: configs/windows-msvc epochs: [0, 20220628] hrname: "Windows, MSVC" @@ -94,6 +100,14 @@ configurations: compiler.runtime: [ "static", "dynamic" ] compiler.runtime_type: [ "Release" ] +cppstd: + apple-clang: + "13": ["gnu17"] + gcc: + "11": ["gnu17"] + msvc: + "192": ["14"] + jenkins: url: "http://mb-jenkins-my-bloody-jenkins:8080"