Prepare branch for early modularization work on 4.0

Issue: 46071
This commit is contained in:
Andy Wilkinson 2025-01-28 15:35:02 +00:00 committed by Phillip Webb
parent b6b570ebeb
commit dead6d00d5
4 changed files with 5 additions and 16 deletions

View File

@ -3,7 +3,7 @@ on:
workflow_dispatch: workflow_dispatch:
push: push:
branches: branches:
- 'main' - 4.0.x-restructure
permissions: permissions:
contents: read contents: read
concurrency: concurrency:
@ -30,7 +30,7 @@ jobs:
- name: Deploy - name: Deploy
uses: spring-io/artifactory-deploy-action@dc1913008c0599f0c4b1fdafb6ff3c502b3565ea # v0.0.2 uses: spring-io/artifactory-deploy-action@dc1913008c0599f0c4b1fdafb6ff3c502b3565ea # v0.0.2
with: with:
build-name: ${{ vars.COMMERCIAL && format('spring-boot-commercial-{0}', '4.0.x') || format('spring-boot-{0}', '4.0.x') }} build-name: ${{ vars.COMMERCIAL && format('spring-boot-commercial-{0}', '4.0.x-restructure') || format('spring-boot-{0}', '4.0.x-restructure') }}
folder: 'deployment-repository' folder: 'deployment-repository'
password: ${{ vars.COMMERCIAL && secrets.COMMERCIAL_ARTIFACTORY_PASSWORD || secrets.ARTIFACTORY_PASSWORD }} password: ${{ vars.COMMERCIAL && secrets.COMMERCIAL_ARTIFACTORY_PASSWORD || secrets.ARTIFACTORY_PASSWORD }}
project: ${{ vars.COMMERCIAL && 'spring' }} project: ${{ vars.COMMERCIAL && 'spring' }}
@ -49,17 +49,6 @@ jobs:
webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }} webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }}
outputs: outputs:
version: ${{ steps.build-and-publish.outputs.version }} version: ${{ steps.build-and-publish.outputs.version }}
trigger-docs-build:
name: Trigger Docs Build
needs: build-and-deploy-snapshot
permissions:
actions: write
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
steps:
- name: Run Deploy Docs Workflow
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: gh workflow run deploy-docs.yml --repo ${{ github.repository }} -r docs-build -f build-refname=${{ github.ref_name }} -f build-version=${{ needs.build-and-deploy-snapshot.outputs.version }}
verify: verify:
name: Verify name: Verify
needs: build-and-deploy-snapshot needs: build-and-deploy-snapshot

View File

@ -2,7 +2,7 @@ name: CI
on: on:
push: push:
branches: branches:
- 'main' - 4.0.x-restructure
permissions: permissions:
contents: read contents: read
jobs: jobs:

View File

@ -2,7 +2,7 @@ name: Run System Tests
on: on:
push: push:
branches: branches:
- 'main' - 4.0.x-restructure
permissions: permissions:
contents: read contents: read
jobs: jobs:

View File

@ -1,4 +1,4 @@
version=4.0.0-SNAPSHOT version=4.0.0-restructure-SNAPSHOT
latestVersion=true latestVersion=true
spring.build-type=oss spring.build-type=oss