From 1641ef29b4a7013ed559050115c49bf9dde1ae80 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 22 Jul 2024 14:44:36 -0400 Subject: [PATCH] Test auto-merge for Dependabot SNAPSHOT upgrades Verify that `springVersion = '6.2.0-M5'` will be upgraded by Dependabot to `6.2.0-SNAPSHOT` and respective PR will be merged automatically after successful project build --- .github/workflows/merge-dependabot-pr.yml | 5 +++-- build.gradle | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/merge-dependabot-pr.yml b/.github/workflows/merge-dependabot-pr.yml index 42d8329d59..0b1d927d8e 100644 --- a/.github/workflows/merge-dependabot-pr.yml +++ b/.github/workflows/merge-dependabot-pr.yml @@ -12,6 +12,7 @@ jobs: merge-dependabot-pr: permissions: write-all - uses: spring-io/spring-github-workflows/.github/workflows/spring-merge-dependabot-pr.yml@v3 + uses: spring-io/spring-github-workflows/.github/workflows/spring-merge-dependabot-pr.yml@main with: - mergeArguments: --auto --squash \ No newline at end of file + mergeArguments: --auto --squash + autoMergeSnapshots: true \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8fef212719..876899e47e 100644 --- a/build.gradle +++ b/build.gradle @@ -114,7 +114,7 @@ ext { springKafkaVersion = '3.3.0-SNAPSHOT' springRetryVersion = '2.0.7' springSecurityVersion = '6.4.0-SNAPSHOT' - springVersion = '6.2.0-SNAPSHOT' + springVersion = '6.2.0-M5' springWsVersion = '4.0.11' testcontainersVersion = '1.19.8' tomcatVersion = '10.1.26'