This is an automated email from the ASF dual-hosted git repository.
vishesh92 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new 522283bdeca Refactor merge conflict checker workflow (#13183)
522283bdeca is described below
commit 522283bdeca92a3c4ce75846c106b1fa80661bbd
Author: dahn <[email protected]>
AuthorDate: Tue May 19 10:01:07 2026 +0200
Refactor merge conflict checker workflow (#13183)
---
.github/workflows/merge-conflict-checker.yml | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/merge-conflict-checker.yml
b/.github/workflows/merge-conflict-checker.yml
index 748156a2d9c..2c826a47c7e 100644
--- a/.github/workflows/merge-conflict-checker.yml
+++ b/.github/workflows/merge-conflict-checker.yml
@@ -17,16 +17,14 @@
name: "PR Merge Conflict Check"
on:
- push:
- pull_request:
- types: [opened, synchronize, reopened]
+ schedule:
+ - cron: '*/10 * * * *'
+ workflow_dispatch:
-permissions: # added using https://github.com/step-security/secure-workflows
- contents: read
+permissions: {}
concurrency:
- group: ${{ github.workflow }}-${{ github.event.pull_request.number ||
github.ref }}
- cancel-in-progress: true
+ group: "gh-aw-${{ github.workflow }}"
jobs:
triage:
