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

Commit 0ab0eed

Browse files
author
Corneil du Plessis
committed
Fix github release [skip ci]
1 parent 2183849 commit 0ab0eed

File tree

3 files changed

+97
-93
lines changed

3 files changed

+97
-93
lines changed

‎.github/rlnotes.mustache‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,15 @@
1111
# Dependent Projects and Compatibility
1212
Component | Version
1313
--- | ---
14-
{{projects.spring_cloud_dataflow_build.name}}|{{projects.spring_cloud_dataflow.version}}
15-
{{projects.spring_cloud_dataflow_common.name}}|{{projects.spring_cloud_dataflow.version}}
1614
{{projects.spring_cloud_deployer.name}}|{{projects.spring_cloud_deployer.version}}
17-
{{projects.spring_cloud_deployer_local.name}}|{{projects.spring_cloud_deployer.version}}
18-
{{projects.spring_cloud_deployer_cloudfoundry.name}}|{{projects.spring_cloud_deployer.version}}
19-
{{projects.spring_cloud_deployer_kubernetes.name}}|{{projects.spring_cloud_deployer.version}}
20-
{{projects.spring_cloud_common_security_config.name}}|{{projects.spring_cloud_dataflow.version}}
21-
{{projects.spring_cloud_skipper.name}}|{{projects.spring_cloud_dataflow.version}}
15+
{{projects.spring_cloud_skipper.name}}|{{projects.spring_cloud_skipper.version}}
2216
{{projects.spring_cloud_dataflow_ui.name}}|{{projects.spring_cloud_dataflow_ui.version}}
2317
{{projects.spring_cloud_dataflow.name}}|{{projects.spring_cloud_dataflow.version}}
2418

2519
# Issues
2620

2721
{{#issues}}
28-
{{repo}}#{{number}} {{title}}
22+
* {{repo}}#{{number}} {{title}}
2923
{{/issues}}
3024

3125
{{#footerslength}}

‎.github/workflows/generate-release-notes.sh‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
#!/usr/bin/env bash
2+
RUNNER_TMP="$1"
3+
DEPLOYER_VERSION="$2"
4+
DATAFLOW_UI_VERSION="$3"
5+
DATAFLOW_VERSION="$4"
6+
if [ "$4" == "" ]; then
7+
echo "Usage: <temp-folder> <deployer-version> <dataflow-ui-version> <dataflow-version>"
8+
exit 1
9+
fi
10+
RELEASE_NOTES_FILE="$RUNNER_TMP/release_notes.md"
11+
RELEASE_NOTES_DATA="$RUNNER_TMP/release_notes_data.json"
12+
RELEASE_NOTES_HEADERS1="$RUNNER_TMP/release_notes_headers1.json"
13+
RELEASE_NOTES_HEADERS2="$RUNNER_TMP/release_notes_headers2.json"
14+
RELEASE_NOTES_HEADERS3="$RUNNER_TMP/release_notes_headers3.json"
15+
RELEASE_NOTES_FOOTERS1="$RUNNER_TMP/release_notes_footers1.json"
16+
RELEASE_NOTES_FOOTERS2="$RUNNER_TMP/release_notes_footers2.json"
17+
RELEASE_NOTES_FOOTERS3="$RUNNER_TMP/release_notes_footers3.json"
18+
RELEASE_NOTES_ISSUES1="$RUNNER_TMP/release_notes_issues1.json"
19+
RELEASE_NOTES_ISSUES2="$RUNNER_TMP/release_notes_issues2.json"
20+
RELEASE_NOTES_ISSUES3="$RUNNER_TMP/release_notes_issues3.json"
21+
RELEASE_NOTES_PROJECT1="$RUNNER_TMP/release_notes_project1.json"
22+
RELEASE_NOTES_PROJECT2="$RUNNER_TMP/release_notes_project2.json"
23+
RELEASE_NOTES_PROJECT3="$RUNNER_TMP/release_notes_project3.json"
24+
echo "Retrieving headers"
25+
gh issue list --repo spring-cloud/spring-cloud-deployer \
26+
--search milestone:$DEPLOYER_VERSION \
27+
--label automation/rlnotes-header \
28+
--state all --json title,body \
29+
--jq '{headers:map(.),headerslength:(length)}' \
30+
> $RELEASE_NOTES_HEADERS1
31+
gh issue list --repo spring-cloud/spring-cloud-dataflow-ui \
32+
--search milestone:$DATAFLOW_UI_VERSION \
33+
--label automation/rlnotes-header \
34+
--state all --json title,body \
35+
--jq '{headers:map(.),headerslength:(length)}' \
36+
> $RELEASE_NOTES_HEADERS2
37+
gh issue list --repo spring-cloud/spring-cloud-dataflow \
38+
--search milestone:$DATAFLOW_VERSION \
39+
--label automation/rlnotes-header \
40+
--state all --json title,body \
41+
--jq '{headers:map(.),headerslength:(length)}' \
42+
> $RELEASE_NOTES_HEADERS3
43+
echo "Retrieving footers"
44+
gh issue list --repo spring-cloud/spring-cloud-deployer \
45+
--search milestone:$DEPLOYER_VERSION \
46+
--label automation/rlnotes-footer \
47+
--state all --json title,body \
48+
--jq '{footers:map(.),footerslength:(length)}' \
49+
> $RELEASE_NOTES_FOOTERS1
50+
gh issue list --repo spring-cloud/spring-cloud-dataflow-ui \
51+
--search milestone:$DATAFLOW_UI_VERSION \
52+
--label automation/rlnotes-footer \
53+
--state all --json title,body \
54+
--jq '{footers:map(.),footerslength:(length)}' \
55+
> $RELEASE_NOTES_FOOTERS2
56+
gh issue list --repo spring-cloud/spring-cloud-dataflow \
57+
--search milestone:$DATAFLOW_VERSION \
58+
--label automation/rlnotes-footer \
59+
--state all --json title,body \
60+
--jq '{footers:map(.),footerslength:(length)}' \
61+
> $RELEASE_NOTES_FOOTERS3
62+
echo "Creating project data"
63+
echo "{\"name\":\"Spring Cloud Dataflow Deployer\",\"version\":\"$DEPLOYER_VERSION\"}" > $RELEASE_NOTES_PROJECT1
64+
echo "{\"name\":\"Spring Cloud Dataflow UI\",\"version\":\"$DATAFLOW_UI_VERSION\"}" > $RELEASE_NOTES_PROJECT2
65+
echo "{\"name\":\"Spring Cloud Dataflow\",\"version\":\"$DATAFLOW_VERSION\"}" > $RELEASE_NOTES_PROJECT3
66+
67+
echo "Retrieving issues"
68+
gh issue list --repo spring-cloud/spring-cloud-deployer \
69+
--search milestone:$DEPLOYER_VERSION \
70+
--state all --json number,title,labels \
71+
--jq '{issues:map(select((.labels | length == 0) or (any(.labels[].name; startswith("automation/rlnotes")|not))) + {repo:"spring-cloud/spring-cloud-deployer"})}' \
72+
> $RELEASE_NOTES_ISSUES1
73+
gh issue list --repo spring-cloud/spring-cloud-dataflow-ui \
74+
--search milestone:$DATAFLOW_UI_VERSION \
75+
--state all --json number,title,labels \
76+
--jq '{issues:map(select((.labels | length == 0) or (any(.labels[].name; startswith("automation/rlnotes")|not))) + {repo:"spring-cloud/spring-cloud-dataflow-ui"})}' \
77+
> $RELEASE_NOTES_ISSUES2
78+
gh issue list --repo spring-cloud/spring-cloud-dataflow \
79+
--search milestone:$DATAFLOW_VERSION \
80+
--state all --limit 100 --json number,title,labels \
81+
--jq '{issues:map(select((.labels | length == 0) or (any(.labels[].name; startswith("automation/rlnotes")|not))) + {repo:"spring-cloud/spring-cloud-dataflow"})}' \
82+
> $RELEASE_NOTES_ISSUES3
83+
echo "Creating release notes data"
84+
jq -s '{issues:(.[0].issues + .[1].issues + .[2].issues),headers:(.[3].headers + .[4].headers + .[5].headers),headerslength:(.[3].headerslength + .[4].headerslength + .[5].headerslength),footers:(.[6].footers + .[7].footers + .[8].footers), footerslength:(.[6].footerslength + .[7].footerslength + .[8].footerslength),projects:{spring_cloud_deployer:{name:"Spring Cloud Deployer",version:(.[9].version)},spring_cloud_skipper:{name:"Spring Cloud Skipper",version:(.[11].version)},spring_cloud_dataflow_ui:{name:"Spring Cloud Dataflow UI",version:(.[10].version)},spring_cloud_dataflow:{name:"Spring Cloud Dataflow",version:(.[11].version)}}}' \
85+
$RELEASE_NOTES_ISSUES1 $RELEASE_NOTES_ISSUES2 $RELEASE_NOTES_ISSUES3 \
86+
$RELEASE_NOTES_HEADERS1 $RELEASE_NOTES_HEADERS2 $RELEASE_NOTES_HEADERS3 \
87+
$RELEASE_NOTES_FOOTERS1 $RELEASE_NOTES_FOOTERS2 $RELEASE_NOTES_FOOTERS3 \
88+
$RELEASE_NOTES_PROJECT1 $RELEASE_NOTES_PROJECT2 $RELEASE_NOTES_PROJECT3 \
89+
> $RELEASE_NOTES_DATA
90+
echo "Applying mustache templates"
91+
mustache $RELEASE_NOTES_DATA .github/rlnotes.mustache > $RELEASE_NOTES_FILE

‎.github/workflows/github-release.yml‎

Lines changed: 4 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -31,97 +31,16 @@ jobs:
3131
curl -sSL https://github.com/cbroglie/mustache/releases/download/v1.2.2/mustache_1.2.2_linux_amd64.tar.gz | sudo tar -C /usr/local/bin/ --no-same-owner -xzv mustache
3232
# release notes and gh release
3333
- name: Release
34+
shell: bash
3435
env:
3536
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
36-
RELEASE_NOTES_FILE: ${{runner.temp}}/release_notes.md5
37-
RELEASE_NOTES_DATA: ${{runner.temp}}/release_notes_data.json
38-
RELEASE_NOTES_HEADERS1: ${{runner.temp}}/release_notes_headers1.json
39-
RELEASE_NOTES_HEADERS2: ${{runner.temp}}/release_notes_headers2.json
40-
RELEASE_NOTES_HEADERS3: ${{runner.temp}}/release_notes_headers3.json
41-
RELEASE_NOTES_FOOTERS1: ${{runner.temp}}/release_notes_footers1.json
42-
RELEASE_NOTES_FOOTERS2: ${{runner.temp}}/release_notes_footers2.json
43-
RELEASE_NOTES_FOOTERS3: ${{runner.temp}}/release_notes_footers3.json
44-
RELEASE_NOTES_ISSUES1: ${{runner.temp}}/release_notes_issues1.json
45-
RELEASE_NOTES_ISSUES2: ${{runner.temp}}/release_notes_issues2.json
46-
RELEASE_NOTES_ISSUES3: ${{runner.temp}}/release_notes_issues3.json
47-
RELEASE_NOTES_PROJECT1: ${{runner.temp}}/release_notes_project1.json
48-
RELEASE_NOTES_PROJECT2: ${{runner.temp}}/release_notes_project2.json
49-
RELEASE_NOTES_PROJECT3: ${{runner.temp}}/release_notes_project3.json
5037
run: |
51-
gh issue list \
52-
--repo spring-cloud/spring-cloud-deployer \
53-
--search milestone:$BUILD_ZOO_HANDLER_spring_cloud_deployer_version \
54-
--label automation/rlnotes-header \
55-
--state all --json title,body \
56-
--jq '{headers:map(.),headerslength:(length)}' \
57-
> $RELEASE_NOTES_HEADERS1
58-
gh issue list \
59-
--repo spring-cloud/spring-cloud-dataflow-ui \
60-
--search milestone:$BUILD_ZOO_HANDLER_spring_cloud_dataflow_ui_version \
61-
--label automation/rlnotes-header \
62-
--state all --json title,body \
63-
--jq '{headers:map(.),headerslength:(length)}' \
64-
> $RELEASE_NOTES_HEADERS2
65-
gh issue list \
66-
--repo spring-cloud/spring-cloud-dataflow \
67-
--search milestone:$BUILD_ZOO_HANDLER_spring_cloud_dataflow_version \
68-
--label automation/rlnotes-header \
69-
--state all --json title,body \
70-
--jq '{headers:map(.),headerslength:(length)}' \
71-
> $RELEASE_NOTES_HEADERS3
72-
gh issue list \
73-
--repo spring-cloud/spring-cloud-deployer \
74-
--search milestone:$BUILD_ZOO_HANDLER_spring_cloud_deployer_version \
75-
--label automation/rlnotes-footer \
76-
--state all --json title,body \
77-
--jq '{footers:map(.),footerslength:(length)}' \
78-
> $RELEASE_NOTES_FOOTERS1
79-
gh issue list \
80-
--repo spring-cloud/spring-cloud-dataflow-ui \
81-
--search milestone:$BUILD_ZOO_HANDLER_spring_cloud_dataflow_ui_version \
82-
--label automation/rlnotes-footer \
83-
--state all --json title,body \
84-
--jq '{footers:map(.),footerslength:(length)}' \
85-
> $RELEASE_NOTES_FOOTERS2
86-
gh issue list \
87-
--repo spring-cloud/spring-cloud-dataflow \
88-
--search milestone:$BUILD_ZOO_HANDLER_spring_cloud_dataflow_version \
89-
--label automation/rlnotes-footer \
90-
--state all --json title,body \
91-
--jq '{footers:map(.),footerslength:(length)}' \
92-
> $RELEASE_NOTES_FOOTERS3
93-
echo "{\"name\":\"Spring Cloud Dataflow Deployer\",\"version\":\"$BUILD_ZOO_HANDLER_spring_cloud_deployer_version\"}" > $RELEASE_NOTES_PROJECT1
94-
echo "{\"name\":\"Spring Cloud Dataflow UI\",\"version\":\"$BUILD_ZOO_HANDLER_spring_cloud_dataflow_ui_version\"}" > $RELEASE_NOTES_PROJECT2
95-
echo "{\"name\":\"Spring Cloud Dataflow\",\"version\":\"$BUILD_ZOO_HANDLER_spring_cloud_dataflow_version\"}" > $RELEASE_NOTES_PROJECT3
96-
gh issue list \
97-
--repo spring-cloud/spring-cloud-deployer \
98-
--search milestone:$BUILD_ZOO_HANDLER_spring_cloud_deployer_version \
99-
--state all --json number,title,labels \
100-
--jq '{issues:map(select((.labels | length == 0) or (any(.labels[].name; startswith("automation/rlnotes")|not))) + {repo:"spring-cloud/spring-cloud-deployer"})}' \
101-
> $RELEASE_NOTES_ISSUES1
102-
gh issue list \
103-
--repo spring-cloud/spring-cloud-dataflow-ui \
104-
--search milestone:$BUILD_ZOO_HANDLER_spring_cloud_dataflow_ui_version \
105-
--state all --json number,title,labels \
106-
--jq '{issues:map(select((.labels | length == 0) or (any(.labels[].name; startswith("automation/rlnotes")|not))) + {repo:"spring-cloud/spring-cloud-dataflow-ui"})}' \
107-
> $RELEASE_NOTES_ISSUES2
108-
gh issue list \
109-
--repo spring-cloud/spring-cloud-dataflow \
110-
--search milestone:$BUILD_ZOO_HANDLER_spring_cloud_dataflow_version \
111-
--state all --limit 100 --json number,title,labels \
112-
--jq '{issues:map(select((.labels | length == 0) or (any(.labels[].name; startswith("automation/rlnotes")|not))) + {repo:"spring-cloud/spring-cloud-dataflow"})}' \
113-
> $RELEASE_NOTES_ISSUES3
114-
jq -s '{issues:(.[0].issues + .[1].issues + .[2].issues + .[3].issues + .[4].issues + .[5].issues + .[6].issues + .[7].issues + .[8].issues + .[9].issues),headers:(.[10].headers + .[11].headers + .[12].headers + .[13].headers + .[14].headers + .[15].headers + .[16].headers + .[17].headers + .[18].headers + .[19].headers),headerslength:(.[10].headerslength + .[11].headerslength + .[12].headerslength + .[13].headerslength + .[14].headerslength + .[15].headerslength + .[16].headerslength + .[17].headerslength + .[18].headerslength + .[19].headerslength),footers:(.[20].footers + .[21].footers + .[22].footers + .[23].footers + .[24].footers + .[25].footers + .[26].footers + .[27].footers + .[28].footers + .[29].footers), footerslength:(.[20].footerslength + .[21].footerslength + .[22].footerslength + .[23].footerslength + .[24].footerslength + .[25].footerslength + .[26].footerslength + .[27].footerslength + .[28].footerslength + .[29].footerslength),projects:{spring_cloud_dataflow_build:{name:"Spring Cloud Dataflow Build",version:(.[30].version)},spring_cloud_dataflow_common:{name:"Spring Cloud Dataflow Common",version:(.[31].version)},spring_cloud_deployer:{name:"Spring Cloud Deployer",version:(.[32].version)},spring_cloud_deployer_local:{name:"Spring Cloud Deployer Local",version:(.[33].version)},spring_cloud_deployer_cloudfoundry:{name:"Spring Cloud Deployer CF",version:(.[34].version)},spring_cloud_deployer_kubernetes:{name:"Spring Cloud Deployer K8S",version:(.[35].version)},spring_cloud_common_security_config:{name:"Spring Cloud Common Security Config",version:(.[36].version)},spring_cloud_skipper:{name:"Spring Cloud Skipper",version:(.[37].version)},spring_cloud_dataflow_ui:{name:"Spring Cloud Dataflow UI",version:(.[38].version)},spring_cloud_dataflow:{name:"Spring Cloud Dataflow",version:(.[39].version)}}}' \
115-
$RELEASE_NOTES_ISSUES1 $RELEASE_NOTES_ISSUES2 $RELEASE_NOTES_ISSUES3 \
116-
$RELEASE_NOTES_HEADERS1 $RELEASE_NOTES_HEADERS2 $RELEASE_NOTES_HEADERS3 \
117-
$RELEASE_NOTES_FOOTERS1 $RELEASE_NOTES_FOOTERS2 $RELEASE_NOTES_FOOTERS3 \
118-
$RELEASE_NOTES_PROJECT1 $RELEASE_NOTES_PROJECT2 $RELEASE_NOTES_PROJECT3 \
119-
> $RELEASE_NOTES_DATA
120-
mustache $RELEASE_NOTES_DATA .github/rlnotes.mustache > $RELEASE_NOTES_FILE
38+
# generate release notes
39+
.github/workflows/generate-release-notes.sh "${{ runner.temp }}" "$BUILD_ZOO_HANDLER_spring_cloud_deployer_version" "$BUILD_ZOO_HANDLER_spring_cloud_dataflow_ui_version" "$BUILD_ZOO_HANDLER_spring_cloud_dataflow_version"
12140
gh release create v$BUILD_ZOO_HANDLER_spring_cloud_dataflow_version \
12241
--draft \
12342
--title "Spring Cloud Data Flow $BUILD_ZOO_HANDLER_spring_cloud_dataflow_version" \
124-
--notes-file $RELEASE_NOTES_FILE
43+
--notes-file "${{runner.temp}}/release_notes.md"
12544
# retrieve spring-cloud-dataflow-package and upload to github release
12645
export PACKAGE_VERSION=${$BUILD_ZOO_HANDLER_spring_cloud_dataflow_version}
12746
pushd spring-cloud-dataflow-package

0 commit comments

Comments
 (0)