From 807ec6aa49e08190b2d770bb18364e7030f2adef Mon Sep 17 00:00:00 2001 From: "Javier G. Sogo" Date: Mon, 11 Jul 2022 12:42:00 +0200 Subject: [PATCH] (#11562) Consider check-runs (GH actions) before merging * Avoid gh-actions duplicated names * move checkruns under github --- .c3i/config_v1.yml | 6 ++++++ .c3i/config_v2.yml | 4 ++++ .github/workflows/linter-conan-v2.yml | 4 ++-- .github/workflows/linter-yaml.yml | 4 ++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.c3i/config_v1.yml b/.c3i/config_v1.yml index a1497a4f23..4017d7f7a6 100644 --- a/.c3i/config_v1.yml +++ b/.c3i/config_v1.yml @@ -16,7 +16,13 @@ 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" diff --git a/.c3i/config_v2.yml b/.c3i/config_v2.yml index 3d53d9bff2..8e29e00f53 100644 --- a/.c3i/config_v2.yml +++ b/.c3i/config_v2.yml @@ -17,7 +17,11 @@ 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: diff --git a/.github/workflows/linter-conan-v2.yml b/.github/workflows/linter-conan-v2.yml index 4d50a44243..d9e2fff2b3 100644 --- a/.github/workflows/linter-conan-v2.yml +++ b/.github/workflows/linter-conan-v2.yml @@ -11,7 +11,7 @@ env: jobs: test_linter: - name: Test linter changes + name: Test linter changes (v2 migration) runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -77,7 +77,7 @@ jobs: echo '> Note.- Check uploaded artifacts for a full report.' >> $GITHUB_STEP_SUMMARY conanfile_recipe: - name: Lint changed conanfile.py + name: Lint changed conanfile.py (v2 migration) runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/linter-yaml.yml b/.github/workflows/linter-yaml.yml index aa5fd20f92..511e654ab8 100644 --- a/.github/workflows/linter-yaml.yml +++ b/.github/workflows/linter-yaml.yml @@ -12,7 +12,7 @@ env: jobs: test_linter: # A job to run when the linter changes. We want to know in advance how many files will be broken - name: Test linter changes + name: Test linter changes (YAML files) runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -46,7 +46,7 @@ jobs: lint_pr_files: # Lint files modified in the pull_request - name: Lint YML files + name: Lint changed files (YAML files) runs-on: ubuntu-latest steps: - uses: actions/checkout@v3