From 76480834abb61e9fdbbf4a2a454115a4afce4118 Mon Sep 17 00:00:00 2001 From: Sheldon Date: Wed, 11 Oct 2023 10:41:06 +0800 Subject: [PATCH] tune mergify's rules resolve the conflict of mergify's bot Signed-off-by: Sheldon --- .github/mergify.yml | 33 ++++----------------------------- .github/workflows/checks.yaml | 6 +----- .github/workflows/lint-test.yml | 18 +++--------------- 3 files changed, 8 insertions(+), 49 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 6aeec56..6249873 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,34 +1,9 @@ pull_request_rules: - - name: add ci-passed when CI 'Broken Links' passed + - name: add ci-passed when CI passed conditions: - - or: - - check-success=lint-test - - check-success=Broken Links - - files=.github/mergify.yml - - files=.github/workflow/release.yml - - files=.github/workflow/checks.yml + - check-success=lint-test + - check-success=Broken Links actions: label: - add: - - ci-passed - - - name: remove ci-passed when CI 'lint-test' not success - conditions: - - check-failure=lint-test - - or: - - files~=^charts/(.*\.yaml|.*\.helmignore|.*\.tgz|.*\.tpl) - - files=.github/workflows/lint-test.yml - - files=ct.yaml - actions: - label: - remove: - - ci-passed - - - name: remove ci-passed when CI 'Broken Links' not success - conditions: - - check-failure=Broken Links - - files~=.*\.md$ - actions: - label: - remove: + toggle: - ci-passed \ No newline at end of file diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml index 7d38ac9..238982b 100644 --- a/.github/workflows/checks.yaml +++ b/.github/workflows/checks.yaml @@ -4,11 +4,7 @@ on: push: branches: - master - paths: - - '**.md' - pull_request: - paths: - - '**.md' + pull_request: {} jobs: markdown-link-check: diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml index 39be129..422518c 100644 --- a/.github/workflows/lint-test.yml +++ b/.github/workflows/lint-test.yml @@ -3,21 +3,9 @@ name: Helm # This workflow is triggered on pushes or pull request to the repository. on: push: - # file paths to consider in the event. Optional; defaults to all. - paths: - - 'charts/**' - - 'ct.yaml' - - '.github/workflows/lint-test.yml' - - '!**.md' - - '!**.txt' - pull_request: - # file paths to consider in the event. Optional; defaults to all. - paths: - - 'charts/**' - - 'ct.yaml' - - '.github/workflows/lint-test.yml' - - '!**.md' - - '!**.txt' + branches: + - master + pull_request: {} jobs: lint-test: