summaryrefslogtreecommitdiff
path: root/.github/workflows/check-pr-conflicts.yml
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2024-07-02 16:16:24 +0200
committerGitHub <noreply@github.com>2024-07-02 16:16:24 +0200
commit64aee19ad237a2f0b051d1cdecdbb8150e2cc74b (patch)
treecc40e77648499a4404e36a447b97adfe9abb2b22 /.github/workflows/check-pr-conflicts.yml
parent4ae741516480d3319a37549f12a3067409e1976c (diff)
parent53569a889d2caa5a1fa92a7328f4940038d53d43 (diff)
downloadvyos-build-equuleus.tar.gz
vyos-build-equuleus.zip
Merge pull request #669 from vyos/mergify/bp/equuleus/pr-668equuleus
T6508: pr workflows updated for branch and target (backport #668)
Diffstat (limited to '.github/workflows/check-pr-conflicts.yml')
-rw-r--r--.github/workflows/check-pr-conflicts.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/check-pr-conflicts.yml b/.github/workflows/check-pr-conflicts.yml
index 0c659e6e..d5186e71 100644
--- a/.github/workflows/check-pr-conflicts.yml
+++ b/.github/workflows/check-pr-conflicts.yml
@@ -10,5 +10,5 @@ permissions:
jobs:
check-pr-conflict-call:
- uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@feature/T6349-reusable-workflows
+ uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@equuleus
secrets: inherit