From ff39c1fcfbfed247d239a84ef28f1f654b43ede6 Mon Sep 17 00:00:00 2001 From: Chris Bono Date: Mon, 16 Sep 2024 16:37:01 -0500 Subject: [PATCH] [CI] Update workflows with branch 2.11.x [skip ci] --- .github/workflows/build-snapshot-controller.yml | 8 ++++---- .github/workflows/build-snapshot-worker.yml | 4 ++-- .github/workflows/ci-carvel.yml | 2 +- .github/workflows/ci.yml | 4 ++-- .github/workflows/fix-deployment-files.yml | 2 +- .github/workflows/milestone-controller.yml | 12 ++++++------ .github/workflows/milestone-worker.yml | 4 ++-- .github/workflows/next-dev-version-controller.yml | 6 +++--- .github/workflows/next-dev-version-worker.yml | 6 +++--- .github/workflows/publish-docs.yml | 2 +- .github/workflows/release-controller.yml | 14 +++++++------- .github/workflows/release-worker.yml | 6 +++--- .github/workflows/schedule-train-builds.yml | 2 +- 13 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.github/workflows/build-snapshot-controller.yml b/.github/workflows/build-snapshot-controller.yml index cc5d89c058..a543c91d5d 100644 --- a/.github/workflows/build-snapshot-controller.yml +++ b/.github/workflows/build-snapshot-controller.yml @@ -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" } }, @@ -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" } }, @@ -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" } }, @@ -59,7 +59,7 @@ jobs: "workflow_dispatch": { "owner": "spring-cloud", "repo": "spring-cloud-dataflow", - "ref": "main", + "ref": "2.11.x", "workflow": "carvel-worker.yml" } }, diff --git a/.github/workflows/build-snapshot-worker.yml b/.github/workflows/build-snapshot-worker.yml index 22aa334822..757b258cd6 100644 --- a/.github/workflows/build-snapshot-worker.yml +++ b/.github/workflows/build-snapshot-worker.yml @@ -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/build-zoo-handler@v0.0.4 @@ -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" diff --git a/.github/workflows/ci-carvel.yml b/.github/workflows/ci-carvel.yml index a5776a0907..3dd33592ba 100644 --- a/.github/workflows/ci-carvel.yml +++ b/.github/workflows/ci-carvel.yml @@ -3,7 +3,7 @@ name: CI Carvel on: push: branches: - - main + - 2.11.x paths: - 'src/carvel/**' workflow_dispatch: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cbec0c8385..8bdfe9b7b1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: push: branches: - - 'main' + - '2.11.x' paths-ignore: - '.github/**' @@ -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 diff --git a/.github/workflows/fix-deployment-files.yml b/.github/workflows/fix-deployment-files.yml index 5e7205e316..429efb209a 100644 --- a/.github/workflows/fix-deployment-files.yml +++ b/.github/workflows/fix-deployment-files.yml @@ -3,7 +3,7 @@ name: Fix Deployment Files on: push: branches: - - main + - 2.11.x jobs: build: diff --git a/.github/workflows/milestone-controller.yml b/.github/workflows/milestone-controller.yml index 84cd46f033..36a4429857 100644 --- a/.github/workflows/milestone-controller.yml +++ b/.github/workflows/milestone-controller.yml @@ -32,7 +32,7 @@ jobs: "workflow_dispatch": { "owner": "spring-cloud", "repo": "spring-cloud-deployer", - "ref": "main", + "ref": "2.9.x", "workflow": "milestone-worker.yml" } }, @@ -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" } }, @@ -52,7 +52,7 @@ jobs: "workflow_dispatch": { "owner": "spring-cloud", "repo": "spring-cloud-dataflow", - "ref": "main", + "ref": "2.11.x", "workflow": "milestone-worker.yml" } }, @@ -62,7 +62,7 @@ jobs: "workflow_dispatch": { "owner": "spring-cloud", "repo": "spring-cloud-dataflow", - "ref": "main", + "ref": "2.11.x", "workflow": "carvel-worker.yml" } }, @@ -72,7 +72,7 @@ jobs: "workflow_dispatch": { "owner": "spring-cloud", "repo": "spring-cloud-dataflow", - "ref": "main", + "ref": "2.11.x", "workflow": "promote-milestone.yml" } }, @@ -82,7 +82,7 @@ jobs: "workflow_dispatch": { "owner": "spring-cloud", "repo": "spring-cloud-dataflow", - "ref": "main", + "ref": "2.11.x", "workflow": "github-release.yml" } }, diff --git a/.github/workflows/milestone-worker.yml b/.github/workflows/milestone-worker.yml index fd31991839..36256d5186 100644 --- a/.github/workflows/milestone-worker.yml +++ b/.github/workflows/milestone-worker.yml @@ -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 @@ -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 diff --git a/.github/workflows/next-dev-version-controller.yml b/.github/workflows/next-dev-version-controller.yml index 737d134378..b5f78b3a93 100644 --- a/.github/workflows/next-dev-version-controller.yml +++ b/.github/workflows/next-dev-version-controller.yml @@ -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" } }, @@ -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" } }, @@ -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" } }, diff --git a/.github/workflows/next-dev-version-worker.yml b/.github/workflows/next-dev-version-worker.yml index aaaec48b13..1b225f0c59 100644 --- a/.github/workflows/next-dev-version-worker.yml +++ b/.github/workflows/next-dev-version-worker.yml @@ -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 @@ -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/build-zoo-handler@v0.0.4 with: - commit-changes-branch: main + commit-changes-branch: 2.11.x commit-changes-message: Next development version # zoo success diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml index c841300e52..33a72e0d5e 100644 --- a/.github/workflows/publish-docs.yml +++ b/.github/workflows/publish-docs.yml @@ -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' diff --git a/.github/workflows/release-controller.yml b/.github/workflows/release-controller.yml index 92df60d36d..d3837b0556 100644 --- a/.github/workflows/release-controller.yml +++ b/.github/workflows/release-controller.yml @@ -29,7 +29,7 @@ jobs: "workflow_dispatch": { "owner": "spring-cloud", "repo": "spring-cloud-deployer", - "ref": "main", + "ref": "2.9.x", "workflow": "release-worker.yml" } }, @@ -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" } }, @@ -49,7 +49,7 @@ jobs: "workflow_dispatch": { "owner": "spring-cloud", "repo": "spring-cloud-dataflow", - "ref": "main", + "ref": "2.11.x", "workflow": "release-worker.yml" } }, @@ -59,7 +59,7 @@ jobs: "workflow_dispatch": { "owner": "spring-cloud", "repo": "spring-cloud-dataflow", - "ref": "main", + "ref": "2.11.x", "workflow": "carvel-worker.yml" } }, @@ -69,7 +69,7 @@ jobs: "workflow_dispatch": { "owner": "spring-cloud", "repo": "spring-cloud-dataflow", - "ref": "main", + "ref": "2.11.x", "workflow": "promote-release.yml" } }, @@ -79,7 +79,7 @@ jobs: "workflow_dispatch": { "owner": "spring-cloud", "repo": "spring-cloud-dataflow", - "ref": "main", + "ref": "2.11.x", "workflow": "central-release.yml" } }, @@ -89,7 +89,7 @@ jobs: "workflow_dispatch": { "owner": "spring-cloud", "repo": "spring-cloud-dataflow", - "ref": "main", + "ref": "2.11.x", "workflow": "github-release.yml" } }, diff --git a/.github/workflows/release-worker.yml b/.github/workflows/release-worker.yml index a07df98969..228fe1f18e 100644 --- a/.github/workflows/release-worker.yml +++ b/.github/workflows/release-worker.yml @@ -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 @@ -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" diff --git a/.github/workflows/schedule-train-builds.yml b/.github/workflows/schedule-train-builds.yml index f92368f0fc..74053e2233 100644 --- a/.github/workflows/schedule-train-builds.yml +++ b/.github/workflows/schedule-train-builds.yml @@ -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: