SCALRCORE-29806 fixed test

Scalr · Jan 18, 2024 · dd287fd · dd287fd
1 parent f8ad019
commit dd287fd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/.github/actions/update-app-version/index.dist.js b/.github/actions/update-app-version/index.dist.js
@@ -18526,6 +18526,7 @@ async function mergePR (prNumber) {
       owner: github.context.repo.owner,
       repo: github.context.repo.repo,
       pull_number: prNumber,
+      merge_method: 'rebase'
     })
     core.notice(
       `Merged PR #${prNumber}`

diff --git a/.github/actions/update-app-version/index.js b/.github/actions/update-app-version/index.js
@@ -87,6 +87,7 @@ async function mergePR (prNumber) {
       owner: github.context.repo.owner,
       repo: github.context.repo.repo,
       pull_number: prNumber,
+      merge_method: 'rebase'
     })
     core.notice(
       `Merged PR #${prNumber}`