Prepare branch for early restructure work on 4.0

This commit is contained in:
Andy Wilkinson
2025-01-28 15:35:02 +00:00
committed by Phillip Webb
parent 4c6c09f07d
commit 93f646496d
5 changed files with 5 additions and 45 deletions

View File

@@ -3,7 +3,7 @@ on:
workflow_dispatch:
push:
branches:
- 4.0.x
- 4.0.x-restructure
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
jobs:
@@ -28,7 +28,7 @@ jobs:
- name: Deploy
uses: spring-io/artifactory-deploy-action@dc1913008c0599f0c4b1fdafb6ff3c502b3565ea # v0.0.2
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'
password: ${{ vars.COMMERCIAL && secrets.COMMERCIAL_ARTIFACTORY_PASSWORD || secrets.ARTIFACTORY_PASSWORD }}
project: ${{ vars.COMMERCIAL && 'spring' }}
@@ -47,17 +47,6 @@ jobs:
webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }}
outputs:
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 spring-projects/spring-boot -r docs-build -f build-refname=${{ github.ref_name }} -f build-version=${{ needs.build-and-deploy-snapshot.outputs.version }}
verify:
name: Verify
needs: build-and-deploy-snapshot

View File

@@ -2,7 +2,7 @@ name: CI
on:
push:
branches:
- 4.0.x
- 4.0.x-restructure
jobs:
ci:
name: '${{ matrix.os.name}} | Java ${{ matrix.java.version}}'

View File

@@ -2,7 +2,7 @@ name: Run System Tests
on:
push:
branches:
- 4.0.x
- 4.0.x-restructure
jobs:
run-system-tests:
name: 'Java ${{ matrix.java.version}}'

View File

@@ -1,29 +0,0 @@
name: Trigger Docs Build
on:
push:
branches: main
paths: [ 'antora/*' ]
workflow_dispatch:
inputs:
build-refname:
description: 'Git refname to build (e.g., 1.0.x)'
required: false
build-version:
description: 'Version being build (e.g. 1.0.3-SNAPSHOT)'
required: false
permissions:
actions: write
jobs:
trigger-docs-build:
name: Trigger Docs Build
if: github.repository_owner == 'spring-projects'
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
steps:
- name: Check Out
uses: actions/checkout@v4
with:
ref: docs-build
- name: Trigger Workflow
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: gh workflow run deploy-docs.yml -r docs-build -f build-refname=${{ github.event.inputs.build-refname }} -f build-version=${{ github.event.inputs.build-version }}