From 2f12f91d395a45eddb2090145ed707cbc39c7bce Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Mon, 12 Aug 2024 17:00:50 +0300 Subject: [PATCH 1/2] fix: 6205 follow-up --- .github/workflows/merge-check.yml | 2 +- .github/workflows/predict-conflicts.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge-check.yml b/.github/workflows/merge-check.yml index da15a7535d..43758a3ad2 100644 --- a/.github/workflows/merge-check.yml +++ b/.github/workflows/merge-check.yml @@ -7,7 +7,7 @@ on: - push - pull_request_target - pull_request_review: - types: [submitted] + types: [submitted] jobs: check_merge: diff --git a/.github/workflows/predict-conflicts.yml b/.github/workflows/predict-conflicts.yml index 13ddeb5937..9a51f0bf2a 100644 --- a/.github/workflows/predict-conflicts.yml +++ b/.github/workflows/predict-conflicts.yml @@ -2,7 +2,7 @@ name: "Check Potential Conflicts" on: - pull_request_target - pull_request_review: - types: [submitted] + types: [submitted] permissions: contents: read From 52b9fcecb4f28a91658262a52cee36631586b2be Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Mon, 12 Aug 2024 17:45:46 +0300 Subject: [PATCH 2/2] fix: can't mix `-` and `:` --- .github/workflows/merge-check.yml | 6 +++--- .github/workflows/predict-conflicts.yml | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/merge-check.yml b/.github/workflows/merge-check.yml index 43758a3ad2..953c4800fb 100644 --- a/.github/workflows/merge-check.yml +++ b/.github/workflows/merge-check.yml @@ -4,9 +4,9 @@ permissions: pull-requests: write on: - - push - - pull_request_target - - pull_request_review: + push: + pull_request_target: + pull_request_review: types: [submitted] jobs: diff --git a/.github/workflows/predict-conflicts.yml b/.github/workflows/predict-conflicts.yml index 9a51f0bf2a..ea85483566 100644 --- a/.github/workflows/predict-conflicts.yml +++ b/.github/workflows/predict-conflicts.yml @@ -1,7 +1,8 @@ name: "Check Potential Conflicts" + on: - - pull_request_target - - pull_request_review: + pull_request_target: + pull_request_review: types: [submitted] permissions: