From 2c96d7ca97b108cbea8747fc2433af293df0dd02 Mon Sep 17 00:00:00 2001 From: Adrien Kantcheff Date: Fri, 15 Mar 2024 11:33:21 +0100 Subject: [PATCH] ci(merge): replace by _reusable_merge_upstream --- .../{create_merge_pr_upstream.yml => merge_upstream.yml} | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) rename .github/workflows/{create_merge_pr_upstream.yml => merge_upstream.yml} (62%) diff --git a/.github/workflows/create_merge_pr_upstream.yml b/.github/workflows/merge_upstream.yml similarity index 62% rename from .github/workflows/create_merge_pr_upstream.yml rename to .github/workflows/merge_upstream.yml index fcaac2e..ebd74c7 100644 --- a/.github/workflows/create_merge_pr_upstream.yml +++ b/.github/workflows/merge_upstream.yml @@ -1,4 +1,4 @@ -name: Create Merge Pull Request Upstream +name: Merge Upstream on: workflow_dispatch: @@ -9,8 +9,6 @@ on: - "release-*" jobs: - create-merge-pr: - uses: bonitasoft/github-workflows/.github/workflows/_reusable_create_merge_pr.yml@main + merge-upstream: + uses: bonitasoft/github-workflows/.github/workflows/_reusable_merge_upstream.yml@main secrets: inherit - with: - labels: automerge