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

Commit 901e7ad

Browse files
onobconobc
authored
[CI] Update workflows with branch 2.11.x [skip ci] (#5941)
1 parent aa441c3 commit 901e7ad

13 files changed

+36
-36
lines changed

‎.github/workflows/build-snapshot-controller.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
"workflow_dispatch": {
3030
"owner": "spring-cloud",
3131
"repo": "spring-cloud-deployer",
32-
"ref": "main",
32+
"ref": "2.9.x",
3333
"workflow": "build-snapshot-worker.yml"
3434
}
3535
},
@@ -39,7 +39,7 @@ jobs:
3939
"workflow_dispatch": {
4040
"owner": "spring-cloud",
4141
"repo": "spring-cloud-dataflow-ui",
42-
"ref": "main",
42+
"ref": "3.4.x",
4343
"workflow": "build-snapshot-worker.yml"
4444
}
4545
},
@@ -49,7 +49,7 @@ jobs:
4949
"workflow_dispatch": {
5050
"owner": "spring-cloud",
5151
"repo": "spring-cloud-dataflow",
52-
"ref": "main",
52+
"ref": "2.11.x",
5353
"workflow": "build-snapshot-worker.yml"
5454
}
5555
},
@@ -59,7 +59,7 @@ jobs:
5959
"workflow_dispatch": {
6060
"owner": "spring-cloud",
6161
"repo": "spring-cloud-dataflow",
62-
"ref": "main",
62+
"ref": "2.11.x",
6363
"workflow": "carvel-worker.yml"
6464
}
6565
},

‎.github/workflows/build-snapshot-worker.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
--repo-resolve-snapshots=libs-snapshot \
5151
--repo-deploy-releases=libs-release-local \
5252
--repo-deploy-snapshots=libs-snapshot-local
53-
echo JFROG_CLI_BUILD_NAME=spring-cloud-dataflow-main >> $GITHUB_ENV
53+
echo JFROG_CLI_BUILD_NAME=spring-cloud-dataflow-2-11-x >> $GITHUB_ENV
5454
echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
5555
- name: Extract Zoo Context Properties
5656
uses: jvalkeal/[email protected]
@@ -69,7 +69,7 @@ jobs:
6969
jfrog rt build-publish
7070
PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
7171
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$PROJECT_VERSION >> $GITHUB_ENV
72-
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname=spring-cloud-dataflow-main >> $GITHUB_ENV
72+
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname=spring-cloud-dataflow-2-11-x >> $GITHUB_ENV
7373
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildnumber=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
7474
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
7575
# echo "Determine project version"

‎.github/workflows/ci-carvel.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: CI Carvel
33
on:
44
push:
55
branches:
6-
- main
6+
- 2.11.x
77
paths:
88
- 'src/carvel/**'
99
workflow_dispatch:

‎.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_dispatch:
55
push:
66
branches:
7-
- 'main'
7+
- '2.11.x'
88
paths-ignore:
99
- '.github/**'
1010

@@ -57,7 +57,7 @@ jobs:
5757
--repo-resolve-snapshots=libs-snapshot \
5858
--repo-deploy-releases=libs-release-local \
5959
--repo-deploy-snapshots=libs-snapshot-local
60-
echo JFROG_CLI_BUILD_NAME=spring-cloud-dataflow-main >> $GITHUB_ENV
60+
echo JFROG_CLI_BUILD_NAME=spring-cloud-dataflow-2-11-x >> $GITHUB_ENV
6161
echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
6262
echo spring_cloud_dataflow_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) >> $GITHUB_ENV
6363
- uses: ./.github/actions/install-xmlutils

‎.github/workflows/fix-deployment-files.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Fix Deployment Files
33
on:
44
push:
55
branches:
6-
- main
6+
- 2.11.x
77

88
jobs:
99
build:

‎.github/workflows/milestone-controller.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
"workflow_dispatch": {
3333
"owner": "spring-cloud",
3434
"repo": "spring-cloud-deployer",
35-
"ref": "main",
35+
"ref": "2.9.x",
3636
"workflow": "milestone-worker.yml"
3737
}
3838
},
@@ -42,7 +42,7 @@ jobs:
4242
"workflow_dispatch": {
4343
"owner": "spring-cloud",
4444
"repo": "spring-cloud-dataflow-ui",
45-
"ref": "main",
45+
"ref": "3.4.x",
4646
"workflow": "milestone-worker.yml"
4747
}
4848
},
@@ -52,7 +52,7 @@ jobs:
5252
"workflow_dispatch": {
5353
"owner": "spring-cloud",
5454
"repo": "spring-cloud-dataflow",
55-
"ref": "main",
55+
"ref": "2.11.x",
5656
"workflow": "milestone-worker.yml"
5757
}
5858
},
@@ -62,7 +62,7 @@ jobs:
6262
"workflow_dispatch": {
6363
"owner": "spring-cloud",
6464
"repo": "spring-cloud-dataflow",
65-
"ref": "main",
65+
"ref": "2.11.x",
6666
"workflow": "carvel-worker.yml"
6767
}
6868
},
@@ -72,7 +72,7 @@ jobs:
7272
"workflow_dispatch": {
7373
"owner": "spring-cloud",
7474
"repo": "spring-cloud-dataflow",
75-
"ref": "main",
75+
"ref": "2.11.x",
7676
"workflow": "promote-milestone.yml"
7777
}
7878
},
@@ -82,7 +82,7 @@ jobs:
8282
"workflow_dispatch": {
8383
"owner": "spring-cloud",
8484
"repo": "spring-cloud-dataflow",
85-
"ref": "main",
85+
"ref": "2.11.x",
8686
"workflow": "github-release.yml"
8787
}
8888
},

‎.github/workflows/milestone-worker.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
--repo-resolve-snapshots=libs-snapshot \
4747
--repo-deploy-releases=libs-milestone-local \
4848
--repo-deploy-snapshots=libs-snapshot-local
49-
echo JFROG_CLI_BUILD_NAME=spring-cloud-dataflow-main-milestone >> $GITHUB_ENV
49+
echo JFROG_CLI_BUILD_NAME=spring-cloud-dataflow-2-11-x-milestone >> $GITHUB_ENV
5050
echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
5151
5252
# zoo extract and ensure
@@ -100,7 +100,7 @@ jobs:
100100
jfrog rt build-publish
101101
PROJECT_VERSION=$(mvn -gs .github/settings.xml -Pstagingmilestone help:evaluate -Dexpression=project.version -q -DforceStdout)
102102
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$PROJECT_VERSION >> $GITHUB_ENV
103-
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname=spring-cloud-dataflow-main-milestone >> $GITHUB_ENV
103+
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname=spring-cloud-dataflow-2-11-x-milestone >> $GITHUB_ENV
104104
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildnumber=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
105105
106106
# set +e

‎.github/workflows/next-dev-version-controller.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
"workflow_dispatch": {
2828
"owner": "spring-cloud",
2929
"repo": "spring-cloud-deployer",
30-
"ref": "main",
30+
"ref": "2.9.x",
3131
"workflow": "next-dev-version-worker.yml"
3232
}
3333
},
@@ -37,7 +37,7 @@ jobs:
3737
"workflow_dispatch": {
3838
"owner": "spring-cloud",
3939
"repo": "spring-cloud-dataflow-ui",
40-
"ref": "main",
40+
"ref": "3.4.x",
4141
"workflow": "next-dev-version-worker.yml"
4242
}
4343
},
@@ -47,7 +47,7 @@ jobs:
4747
"workflow_dispatch": {
4848
"owner": "spring-cloud",
4949
"repo": "spring-cloud-dataflow",
50-
"ref": "main",
50+
"ref": "2.11.x",
5151
"workflow": "next-dev-version-worker.yml"
5252
}
5353
},

‎.github/workflows/next-dev-version-worker.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
--repo-resolve-snapshots=libs-snapshot \
4949
--repo-deploy-releases=libs-release-local \
5050
--repo-deploy-snapshots=libs-snapshot-local
51-
echo JFROG_CLI_BUILD_NAME=spring-cloud-dataflow-main-ndv >> $GITHUB_ENV
51+
echo JFROG_CLI_BUILD_NAME=spring-cloud-dataflow-2-11-x-ndv >> $GITHUB_ENV
5252
echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
5353
5454
# zoo extract and ensure
@@ -89,14 +89,14 @@ jobs:
8989
./spring-cloud-dataflow-package/set-package-version.sh
9090
jfrog rt mvn install -DskipTests -B
9191
jfrog rt build-publish
92-
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname=spring-cloud-dataflow-main-ndv >> $GITHUB_ENV
92+
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname=spring-cloud-dataflow-2-11-x-ndv >> $GITHUB_ENV
9393
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildnumber=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
9494
9595
# zoo commit
9696
- name: Commit Next Dev Changes
9797
uses: jvalkeal/[email protected]
9898
with:
99-
commit-changes-branch: main
99+
commit-changes-branch: 2.11.x
100100
commit-changes-message: Next development version
101101

102102
# zoo success

‎.github/workflows/publish-docs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
--repo-resolve-snapshots=libs-snapshot \
4343
--repo-deploy-releases=libs-staging-local \
4444
--repo-deploy-snapshots=libs-snapshot-local
45-
echo JFROG_CLI_BUILD_NAME=spring-cloud-dataflow-main-release >> $GITHUB_ENV
45+
echo JFROG_CLI_BUILD_NAME=spring-cloud-dataflow-2-11-x-release >> $GITHUB_ENV
4646
echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
4747
4848
- name: 'Install: xmllint'

‎.github/workflows/release-controller.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
"workflow_dispatch": {
3030
"owner": "spring-cloud",
3131
"repo": "spring-cloud-deployer",
32-
"ref": "main",
32+
"ref": "2.9.x",
3333
"workflow": "release-worker.yml"
3434
}
3535
},
@@ -39,7 +39,7 @@ jobs:
3939
"workflow_dispatch": {
4040
"owner": "spring-cloud",
4141
"repo": "spring-cloud-dataflow-ui",
42-
"ref": "main",
42+
"ref": "3.4.x",
4343
"workflow": "release-worker.yml"
4444
}
4545
},
@@ -49,7 +49,7 @@ jobs:
4949
"workflow_dispatch": {
5050
"owner": "spring-cloud",
5151
"repo": "spring-cloud-dataflow",
52-
"ref": "main",
52+
"ref": "2.11.x",
5353
"workflow": "release-worker.yml"
5454
}
5555
},
@@ -59,7 +59,7 @@ jobs:
5959
"workflow_dispatch": {
6060
"owner": "spring-cloud",
6161
"repo": "spring-cloud-dataflow",
62-
"ref": "main",
62+
"ref": "2.11.x",
6363
"workflow": "carvel-worker.yml"
6464
}
6565
},
@@ -69,7 +69,7 @@ jobs:
6969
"workflow_dispatch": {
7070
"owner": "spring-cloud",
7171
"repo": "spring-cloud-dataflow",
72-
"ref": "main",
72+
"ref": "2.11.x",
7373
"workflow": "promote-release.yml"
7474
}
7575
},
@@ -79,7 +79,7 @@ jobs:
7979
"workflow_dispatch": {
8080
"owner": "spring-cloud",
8181
"repo": "spring-cloud-dataflow",
82-
"ref": "main",
82+
"ref": "2.11.x",
8383
"workflow": "central-release.yml"
8484
}
8585
},
@@ -89,7 +89,7 @@ jobs:
8989
"workflow_dispatch": {
9090
"owner": "spring-cloud",
9191
"repo": "spring-cloud-dataflow",
92-
"ref": "main",
92+
"ref": "2.11.x",
9393
"workflow": "github-release.yml"
9494
}
9595
},

‎.github/workflows/release-worker.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
--repo-resolve-snapshots=libs-snapshot \
4747
--repo-deploy-releases=libs-staging-local \
4848
--repo-deploy-snapshots=libs-snapshot-local
49-
echo JFROG_CLI_BUILD_NAME=spring-cloud-dataflow-main-release >> $GITHUB_ENV
49+
echo JFROG_CLI_BUILD_NAME=spring-cloud-dataflow-2-11-x-release >> $GITHUB_ENV
5050
echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
5151
5252
# zoo extract and ensure
@@ -111,12 +111,12 @@ jobs:
111111
PROJECT_VERSION=$(mvn -gs .github/settings.xml -Pstagingrelease help:evaluate -Dexpression=project.version -q -DforceStdout)
112112
spring_cloud_dataflow_version=$PROJECT_VERSION
113113
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$spring_cloud_dataflow_version >> $GITHUB_ENV
114-
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname=spring-cloud-dataflow-main-release >> $GITHUB_ENV
114+
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname=spring-cloud-dataflow-2-11-x-release >> $GITHUB_ENV
115115
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildnumber=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
116116
echo BUILD_ZOO_HANDLER_spring_cloud_skipper_version=$spring_cloud_dataflow_version >> $GITHUB_ENV
117117
118118
echo "::info ::BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$spring_cloud_dataflow_version"
119-
echo "::info ::BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname=spring-cloud-dataflow-main-release"
119+
echo "::info ::BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname=spring-cloud-dataflow-2-11-x-release"
120120
echo "::info ::BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildnumber=$GITHUB_RUN_NUMBER"
121121
echo "::info ::BUILD_ZOO_HANDLER_spring_cloud_skipper_version=$spring_cloud_dataflow_version"
122122

‎.github/workflows/schedule-train-builds.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
branch: [main]
13+
branch: [2.11.x]
1414
steps:
1515
- uses: benc-uk/workflow-dispatch@v1
1616
with:

0 commit comments

Comments
 (0)