Skip to content
This repository was archived by the owner on May 14, 2025. It is now read-only.

[CI] Update workflows with branch 2.11.x #5941

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build-snapshot-controller.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
"workflow_dispatch": {
"owner": "spring-cloud",
"repo": "spring-cloud-deployer",
"ref": "main",
"ref": "2.9.x",
"workflow": "build-snapshot-worker.yml"
}
},
Expand All @@ -39,7 +39,7 @@ jobs:
"workflow_dispatch": {
"owner": "spring-cloud",
"repo": "spring-cloud-dataflow-ui",
"ref": "main",
"ref": "3.4.x",
"workflow": "build-snapshot-worker.yml"
}
},
Expand All @@ -49,7 +49,7 @@ jobs:
"workflow_dispatch": {
"owner": "spring-cloud",
"repo": "spring-cloud-dataflow",
"ref": "main",
"ref": "2.11.x",
"workflow": "build-snapshot-worker.yml"
}
},
Expand All @@ -59,7 +59,7 @@ jobs:
"workflow_dispatch": {
"owner": "spring-cloud",
"repo": "spring-cloud-dataflow",
"ref": "main",
"ref": "2.11.x",
"workflow": "carvel-worker.yml"
}
},
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-snapshot-worker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
--repo-resolve-snapshots=libs-snapshot \
--repo-deploy-releases=libs-release-local \
--repo-deploy-snapshots=libs-snapshot-local
echo JFROG_CLI_BUILD_NAME=spring-cloud-dataflow-main >> $GITHUB_ENV
echo JFROG_CLI_BUILD_NAME=spring-cloud-dataflow-2-11-x >> $GITHUB_ENV
echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
- name: Extract Zoo Context Properties
uses: jvalkeal/[email protected]
Expand All @@ -69,7 +69,7 @@ jobs:
jfrog rt build-publish
PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$PROJECT_VERSION >> $GITHUB_ENV
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname=spring-cloud-dataflow-main >> $GITHUB_ENV
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname=spring-cloud-dataflow-2-11-x >> $GITHUB_ENV
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildnumber=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
echo BUILD_ZOO_HANDLER_spring_cloud_skipper_version=$(mvn help:evaluate -Dexpression=spring-cloud-skipper.version -pl spring-cloud-dataflow-parent -q -DforceStdout) >> $GITHUB_ENV
# echo "Determine project version"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-carvel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CI Carvel
on:
push:
branches:
- main
- 2.11.x
paths:
- 'src/carvel/**'
workflow_dispatch:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch:
push:
branches:
- 'main'
- '2.11.x'
paths-ignore:
- '.github/**'

Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
--repo-resolve-snapshots=libs-snapshot \
--repo-deploy-releases=libs-release-local \
--repo-deploy-snapshots=libs-snapshot-local
echo JFROG_CLI_BUILD_NAME=spring-cloud-dataflow-main >> $GITHUB_ENV
echo JFROG_CLI_BUILD_NAME=spring-cloud-dataflow-2-11-x >> $GITHUB_ENV
echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
echo spring_cloud_dataflow_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) >> $GITHUB_ENV
- uses: ./.github/actions/install-xmlutils
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fix-deployment-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Fix Deployment Files
on:
push:
branches:
- main
- 2.11.x

jobs:
build:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/milestone-controller.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
"workflow_dispatch": {
"owner": "spring-cloud",
"repo": "spring-cloud-deployer",
"ref": "main",
"ref": "2.9.x",
"workflow": "milestone-worker.yml"
}
},
Expand All @@ -42,7 +42,7 @@ jobs:
"workflow_dispatch": {
"owner": "spring-cloud",
"repo": "spring-cloud-dataflow-ui",
"ref": "main",
"ref": "3.4.x",
"workflow": "milestone-worker.yml"
}
},
Expand All @@ -52,7 +52,7 @@ jobs:
"workflow_dispatch": {
"owner": "spring-cloud",
"repo": "spring-cloud-dataflow",
"ref": "main",
"ref": "2.11.x",
"workflow": "milestone-worker.yml"
}
},
Expand All @@ -62,7 +62,7 @@ jobs:
"workflow_dispatch": {
"owner": "spring-cloud",
"repo": "spring-cloud-dataflow",
"ref": "main",
"ref": "2.11.x",
"workflow": "carvel-worker.yml"
}
},
Expand All @@ -72,7 +72,7 @@ jobs:
"workflow_dispatch": {
"owner": "spring-cloud",
"repo": "spring-cloud-dataflow",
"ref": "main",
"ref": "2.11.x",
"workflow": "promote-milestone.yml"
}
},
Expand All @@ -82,7 +82,7 @@ jobs:
"workflow_dispatch": {
"owner": "spring-cloud",
"repo": "spring-cloud-dataflow",
"ref": "main",
"ref": "2.11.x",
"workflow": "github-release.yml"
}
},
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/milestone-worker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
--repo-resolve-snapshots=libs-snapshot \
--repo-deploy-releases=libs-milestone-local \
--repo-deploy-snapshots=libs-snapshot-local
echo JFROG_CLI_BUILD_NAME=spring-cloud-dataflow-main-milestone >> $GITHUB_ENV
echo JFROG_CLI_BUILD_NAME=spring-cloud-dataflow-2-11-x-milestone >> $GITHUB_ENV
echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV

# zoo extract and ensure
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
jfrog rt build-publish
PROJECT_VERSION=$(mvn -gs .github/settings.xml -Pstagingmilestone help:evaluate -Dexpression=project.version -q -DforceStdout)
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$PROJECT_VERSION >> $GITHUB_ENV
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname=spring-cloud-dataflow-main-milestone >> $GITHUB_ENV
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname=spring-cloud-dataflow-2-11-x-milestone >> $GITHUB_ENV
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildnumber=$GITHUB_RUN_NUMBER >> $GITHUB_ENV

# set +e
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/next-dev-version-controller.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
"workflow_dispatch": {
"owner": "spring-cloud",
"repo": "spring-cloud-deployer",
"ref": "main",
"ref": "2.9.x",
"workflow": "next-dev-version-worker.yml"
}
},
Expand All @@ -37,7 +37,7 @@ jobs:
"workflow_dispatch": {
"owner": "spring-cloud",
"repo": "spring-cloud-dataflow-ui",
"ref": "main",
"ref": "3.4.x",
"workflow": "next-dev-version-worker.yml"
}
},
Expand All @@ -47,7 +47,7 @@ jobs:
"workflow_dispatch": {
"owner": "spring-cloud",
"repo": "spring-cloud-dataflow",
"ref": "main",
"ref": "2.11.x",
"workflow": "next-dev-version-worker.yml"
}
},
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/next-dev-version-worker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
--repo-resolve-snapshots=libs-snapshot \
--repo-deploy-releases=libs-release-local \
--repo-deploy-snapshots=libs-snapshot-local
echo JFROG_CLI_BUILD_NAME=spring-cloud-dataflow-main-ndv >> $GITHUB_ENV
echo JFROG_CLI_BUILD_NAME=spring-cloud-dataflow-2-11-x-ndv >> $GITHUB_ENV
echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV

# zoo extract and ensure
Expand Down Expand Up @@ -89,14 +89,14 @@ jobs:
./spring-cloud-dataflow-package/set-package-version.sh
jfrog rt mvn install -DskipTests -B
jfrog rt build-publish
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname=spring-cloud-dataflow-main-ndv >> $GITHUB_ENV
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname=spring-cloud-dataflow-2-11-x-ndv >> $GITHUB_ENV
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildnumber=$GITHUB_RUN_NUMBER >> $GITHUB_ENV

# zoo commit
- name: Commit Next Dev Changes
uses: jvalkeal/[email protected]
with:
commit-changes-branch: main
commit-changes-branch: 2.11.x
commit-changes-message: Next development version

# zoo success
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
--repo-resolve-snapshots=libs-snapshot \
--repo-deploy-releases=libs-staging-local \
--repo-deploy-snapshots=libs-snapshot-local
echo JFROG_CLI_BUILD_NAME=spring-cloud-dataflow-main-release >> $GITHUB_ENV
echo JFROG_CLI_BUILD_NAME=spring-cloud-dataflow-2-11-x-release >> $GITHUB_ENV
echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV

- name: 'Install: xmllint'
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/release-controller.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
"workflow_dispatch": {
"owner": "spring-cloud",
"repo": "spring-cloud-deployer",
"ref": "main",
"ref": "2.9.x",
"workflow": "release-worker.yml"
}
},
Expand All @@ -39,7 +39,7 @@ jobs:
"workflow_dispatch": {
"owner": "spring-cloud",
"repo": "spring-cloud-dataflow-ui",
"ref": "main",
"ref": "3.4.x",
"workflow": "release-worker.yml"
}
},
Expand All @@ -49,7 +49,7 @@ jobs:
"workflow_dispatch": {
"owner": "spring-cloud",
"repo": "spring-cloud-dataflow",
"ref": "main",
"ref": "2.11.x",
"workflow": "release-worker.yml"
}
},
Expand All @@ -59,7 +59,7 @@ jobs:
"workflow_dispatch": {
"owner": "spring-cloud",
"repo": "spring-cloud-dataflow",
"ref": "main",
"ref": "2.11.x",
"workflow": "carvel-worker.yml"
}
},
Expand All @@ -69,7 +69,7 @@ jobs:
"workflow_dispatch": {
"owner": "spring-cloud",
"repo": "spring-cloud-dataflow",
"ref": "main",
"ref": "2.11.x",
"workflow": "promote-release.yml"
}
},
Expand All @@ -79,7 +79,7 @@ jobs:
"workflow_dispatch": {
"owner": "spring-cloud",
"repo": "spring-cloud-dataflow",
"ref": "main",
"ref": "2.11.x",
"workflow": "central-release.yml"
}
},
Expand All @@ -89,7 +89,7 @@ jobs:
"workflow_dispatch": {
"owner": "spring-cloud",
"repo": "spring-cloud-dataflow",
"ref": "main",
"ref": "2.11.x",
"workflow": "github-release.yml"
}
},
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-worker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
--repo-resolve-snapshots=libs-snapshot \
--repo-deploy-releases=libs-staging-local \
--repo-deploy-snapshots=libs-snapshot-local
echo JFROG_CLI_BUILD_NAME=spring-cloud-dataflow-main-release >> $GITHUB_ENV
echo JFROG_CLI_BUILD_NAME=spring-cloud-dataflow-2-11-x-release >> $GITHUB_ENV
echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV

# zoo extract and ensure
Expand Down Expand Up @@ -111,12 +111,12 @@ jobs:
PROJECT_VERSION=$(mvn -gs .github/settings.xml -Pstagingrelease help:evaluate -Dexpression=project.version -q -DforceStdout)
spring_cloud_dataflow_version=$PROJECT_VERSION
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$spring_cloud_dataflow_version >> $GITHUB_ENV
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname=spring-cloud-dataflow-main-release >> $GITHUB_ENV
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname=spring-cloud-dataflow-2-11-x-release >> $GITHUB_ENV
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildnumber=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
echo BUILD_ZOO_HANDLER_spring_cloud_skipper_version=$spring_cloud_dataflow_version >> $GITHUB_ENV

echo "::info ::BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$spring_cloud_dataflow_version"
echo "::info ::BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname=spring-cloud-dataflow-main-release"
echo "::info ::BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname=spring-cloud-dataflow-2-11-x-release"
echo "::info ::BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildnumber=$GITHUB_RUN_NUMBER"
echo "::info ::BUILD_ZOO_HANDLER_spring_cloud_skipper_version=$spring_cloud_dataflow_version"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/schedule-train-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
branch: [main]
branch: [2.11.x]
steps:
- uses: benc-uk/workflow-dispatch@v1
with:
Expand Down