Skip to content

Commit 29fdef0

Browse files
jzheauxjzheaux
committed
Merge branch '4.0.x' into 4.1.x
Issue gh-4030
2 parents 7c139d6 + c4ec499 commit 29fdef0

5 files changed

Lines changed: 79 additions & 54 deletions

File tree

.github/workflows/merge-dependabot-pr.yml renamed to .github/workflows/dependabot-pull-request-automerge.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Merge Dependabot PR
1+
name: Dependabot - Auto-merge PR
22

33
on:
44
pull_request:
@@ -12,6 +12,6 @@ run-name: Merge Dependabot PR ${{ github.ref_name }}
1212
jobs:
1313
merge-dependabot-pr:
1414
permissions: write-all
15-
uses: spring-io/spring-github-workflows/.github/workflows/spring-merge-dependabot-pr.yml@fa7e8a8f981064983e9468225e052f14af7c67d4
15+
uses: spring-io/spring-github-workflows/.github/workflows/spring-merge-dependabot-pr.yml@0c09eb4023e17dd6ca395a0f4e406a4f7506a58d # main
1616
with:
1717
mergeArguments: --auto --rebase

‎.github/workflows/dependabot-pull-request-build.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Dependabot - Build Pull Request
2+
3+
on: pull_request
4+
5+
permissions:
6+
contents: read
7+
8+
env:
9+
JAVA_VERSION: '17'
10+
11+
jobs:
12+
build:
13+
name: Build
14+
runs-on: ${{ vars.UBUNTU_RUNS_ON }}
15+
if: github.actor == 'dependabot[bot]'
16+
steps:
17+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
18+
- id: secrets
19+
uses: ./.github/actions/compute-secrets
20+
- uses: spring-io/spring-security-actions/pr-build@96df48300f5fa058d0765832d48a534cc6a378d5 # 0.0.3
21+
env:
22+
ORG_GRADLE_PROJECT_artifactoryUsername: ${{ secrets[steps.secrets.outputs.dependabot-username] }}
23+
ORG_GRADLE_PROJECT_artifactoryPassword: ${{ secrets[steps.secrets.outputs.dependabot-password] }}
24+
with:
25+
java-version: ${{ env.JAVA_VERSION }}
26+
build-check:
27+
name: Build
28+
needs: build
29+
if: failure() || cancelled()
30+
runs-on: ubuntu-latest
31+
steps:
32+
- run: exit 1

‎.github/workflows/deploy-docs.yml‎

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,22 @@
11
name: Deploy Docs
22
on:
33
push:
4-
branches-ignore:
5-
- "gh-pages"
6-
- "dependabot/**"
7-
tags: '**'
8-
repository_dispatch:
9-
types: request-build-reference # legacy
10-
#schedule:
11-
#- cron: '0 10 * * *' # Once per day at 10am UTC
4+
branches:
5+
- "*.x"
6+
- "main"
127
workflow_dispatch:
138
permissions: read-all
149
jobs:
1510
build:
1611
runs-on: ubuntu-latest
17-
if: github.repository_owner == 'spring-projects'
12+
if: github.repository == 'spring-projects/spring-session'
1813
steps:
19-
- name: Checkout
20-
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
21-
with:
22-
ref: docs-build
23-
fetch-depth: 1
24-
- name: Dispatch (partial build)
25-
if: github.ref_type == 'branch'
26-
env:
27-
GH_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
28-
run: gh workflow run deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD) -f build-refname=${{ github.ref_name }}
29-
- name: Dispatch (full build)
30-
if: github.ref_type == 'tag'
31-
env:
32-
GH_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
33-
run: gh workflow run deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD)
14+
- name: Checkout
15+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
16+
with:
17+
ref: docs-build
18+
fetch-depth: 1
19+
- name: Dispatch (partial build)
20+
env:
21+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
22+
run: gh workflow run deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD) -f build-refname=${{ github.ref_name }}

‎.github/workflows/pr-build-workflow.yml‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎.github/workflows/pull-request-build.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Pull Request - Build
2+
3+
on: pull_request
4+
5+
permissions:
6+
contents: read
7+
8+
env:
9+
JAVA_VERSION: '17'
10+
11+
jobs:
12+
build:
13+
name: Build
14+
runs-on: ${{ vars.UBUNTU_RUNS_ON }}
15+
if: github.event.pull_request.head.repo.fork == false && github.actor != 'dependabot[bot]'
16+
steps:
17+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
18+
- id: secrets
19+
uses: ./.github/actions/compute-secrets
20+
- uses: spring-io/spring-security-actions/pr-build@96df48300f5fa058d0765832d48a534cc6a378d5 # 0.0.3
21+
env:
22+
ORG_GRADLE_PROJECT_artifactoryUsername: ${{ secrets[steps.secrets.outputs.dependencies-username] }}
23+
ORG_GRADLE_PROJECT_artifactoryPassword: ${{ secrets[steps.secrets.outputs.dependencies-password] }}
24+
with:
25+
java-version: ${{ env.JAVA_VERSION }}
26+
build-check:
27+
name: Build
28+
needs: build
29+
if: failure() || cancelled()
30+
runs-on: ubuntu-latest
31+
steps:
32+
- run: exit 1

0 commit comments

Comments
 (0)