diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 705a992b4b..49358e8ed5 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -1,8 +1,12 @@ name: Deploy Docs on: push: - branches-ignore: [ gh-pages ] - tags: '**' + branches: + - '*.x' + - main + tags: + - '**' + repository_dispatch: types: request-build-reference # legacy #schedule: @@ -21,13 +25,16 @@ jobs: if: github.repository_owner == 'spring-projects' steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: docs-build fetch-depth: 1 + show-progress: false + - name: Dispatch (partial build) if: github.ref_type == 'branch' run: gh workflow run deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD) -f build-refname=${{ github.ref_name }} + - name: Dispatch (full build) if: github.ref_type == 'tag' run: gh workflow run deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD) diff --git a/.github/workflows/merge-dependabot-pr.yml b/.github/workflows/merge-dependabot-pr.yml new file mode 100644 index 0000000000..7dfa29e2e0 --- /dev/null +++ b/.github/workflows/merge-dependabot-pr.yml @@ -0,0 +1,14 @@ +name: Merge Dependabot PR + +on: + pull_request: + branches: + - main + +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@v1 \ No newline at end of file