From 9babe5cd6573753244af86aad19b1ff4ab2bfd98 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Fri, 16 Feb 2024 14:53:42 -0500 Subject: [PATCH] Make PR & Dependabot WFs working against support branches (cherry picked from commit 1f4d27d71fef9d8e933206502d8ec2d4c9910edc) # Conflicts: # .github/workflows/merge-dependabot-pr.yml --- .github/workflows/merge-dependabot-pr.yml | 17 +++++++++++++++++ .github/workflows/pr-build.yml | 1 + 2 files changed, 18 insertions(+) create mode 100644 .github/workflows/merge-dependabot-pr.yml diff --git a/.github/workflows/merge-dependabot-pr.yml b/.github/workflows/merge-dependabot-pr.yml new file mode 100644 index 0000000000..743781a0dc --- /dev/null +++ b/.github/workflows/merge-dependabot-pr.yml @@ -0,0 +1,17 @@ +name: Merge Dependabot PR + +on: + pull_request: + branches: + - main + - '*.x' + +run-name: Merge Dependabot PR ${{ github.ref_name }} + +jobs: + merge-dependabot-pr: + permissions: write-all + + uses: spring-io/spring-github-workflows/.github/workflows/spring-merge-dependabot-pr.yml@main + with: + mergeArguments: --auto --squash \ No newline at end of file diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 945b2f94d9..9bb9bad611 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -4,6 +4,7 @@ on: pull_request: branches: - main + - '*.x' jobs: build-pull-request: