Revert "Retarget workflow triggers to 5.0.x [skip actions]"

This reverts commit ab72b970c0.
This commit is contained in:
Ryan Baxter
2026-09-03 18:14:56 -04:00
parent 2ab399a0fd
commit a48f6f5b36
3 changed files with 17 additions and 6 deletions
+6 -2
View File
@@ -1,20 +1,24 @@
name: Spring Cloud Netflix CI Job name: Spring Cloud Netflix CI Job
on: on:
push: push:
branches: branches:
- 5.0.x - main
- 4.3.x - 4.3.x
# Scheduled builds run daily at midnight UTC # Scheduled builds run daily at midnight UTC
schedule: schedule:
- cron: '0 0 * * *' - cron: '0 0 * * *'
# Manual trigger with optional branch override # Manual trigger with optional branch override
workflow_dispatch: workflow_dispatch:
inputs: inputs:
branches: branches:
description: "Which branch should be built (can be a comma-separated list of branches)" description: "Which branch should be built (can be a comma-separated list of branches)"
required: true required: true
default: '5.0.x' default: 'main'
type: string type: string
jobs: jobs:
deploy: deploy:
uses: spring-cloud/spring-cloud-github-actions/.github/workflows/deploy.yml@b6a6b1963b8762420526591c3d363bd7d09e7d4b # v1.1.1 uses: spring-cloud/spring-cloud-github-actions/.github/workflows/deploy.yml@b6a6b1963b8762420526591c3d363bd7d09e7d4b # v1.1.1
+8 -3
View File
@@ -5,6 +5,7 @@
# there and re-run the rollout, otherwise your change will be overwritten. # there and re-run the rollout, otherwise your change will be overwritten.
name: Deploy Docs name: Deploy Docs
on: on:
push: push:
# Allow-list of exactly this branch. A topic or Dependabot branch cut from # Allow-list of exactly this branch. A topic or Dependabot branch cut from
@@ -12,14 +13,16 @@ on:
# those would dispatch a full docs build for a ref that is not in the # those would dispatch a full docs build for a ref that is not in the
# Antora playbook. # Antora playbook.
branches: branches:
- 5.0.x - main
tags: '**' tags: '**'
repository_dispatch: repository_dispatch:
types: request-build-reference # legacy types: request-build-reference # legacy
workflow_dispatch: workflow_dispatch:
permissions: permissions:
contents: read # required to check out private commercial repositories contents: read # required to check out private commercial repositories
actions: write # required to dispatch the docs build actions: write # required to dispatch the docs build
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@@ -29,6 +32,7 @@ jobs:
with: with:
ref: docs-build ref: docs-build
fetch-depth: 1 fetch-depth: 1
# A branch push rebuilds just that branch's docs; a tag push rebuilds # A branch push rebuilds just that branch's docs; a tag push rebuilds
# everything so the new version appears in the version dropdown. # everything so the new version appears in the version dropdown.
- name: Dispatch (partial build) - name: Dispatch (partial build)
@@ -36,6 +40,7 @@ jobs:
env: env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: gh workflow run deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD) -f build-refname=${{ github.ref_name }} run: gh workflow run deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD) -f build-refname=${{ github.ref_name }}
- name: Dispatch (full build) - name: Dispatch (full build)
if: github.ref_type == 'tag' if: github.ref_type == 'tag'
env: env:
+3 -1
View File
@@ -1,7 +1,9 @@
name: PR name: PR
on: on:
pull_request: pull_request:
branches: [5.0.x, 4.3.x] branches: [ main, 4.3.x ]
jobs: jobs:
build: build:
uses: spring-cloud/spring-cloud-github-actions/.github/workflows/pr.yml@b6a6b1963b8762420526591c3d363bd7d09e7d4b # v1.1.1 uses: spring-cloud/spring-cloud-github-actions/.github/workflows/pr.yml@b6a6b1963b8762420526591c3d363bd7d09e7d4b # v1.1.1