chore(merge): 7.14.x into 7.15.x

bonitasoft · Mar 15, 2024 · 2c3d15f · 2c3d15f
2 parents 83e03f1 + 7816d99
commit 2c3d15f
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/...ub/workflows/create_merge_pr_upstream.yml → .github/workflows/merge_upstream.yml b/...ub/workflows/create_merge_pr_upstream.yml → .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