Skip to content

Commit a0017fa

Browse files
committed
Merge branch 'v8_1' into v9_0
2 parents 6fb9bc8 + 64015da commit a0017fa

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

ci/test.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ nm.slack_notify() {
184184
archiveArtifacts(artifacts: '*.tgz')
185185
archiveArtifacts(artifacts: '*.md5')
186186
archiveArtifacts(artifacts: '*.txt')
187+
sh 'rm *ReleaseNotes.txt'
187188
stash name: 'text_files', includes: '*.txt'
188189
zip_and_archive_files(
189190
"tcpdirect-${tcpdirect_version_long}-tarball-doxbox.zip",

scripts/tcpdirect_misc/tcpdirect-extract-notes

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ else
2626
err "No Changelog file found in Tarball"
2727
fi
2828

29+
if [ -f "$dir/ReleaseNotes" ]; then
30+
try mv "$dir/ReleaseNotes" "$dst/$dir-ReleaseNotes.txt"
31+
else
32+
err "No ReleaseNotes file found in Tarball"
33+
fi
34+
2935
if [ -f "$dir/LICENSE" ]; then
3036
try mv "$dir/LICENSE" "$dst/$dir-LICENSE.txt"
3137
else

scripts/zf_make_tarball

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,12 @@ make_release_package() {
3434
fi
3535

3636
# Add documents to tarball
37+
# Currently only ReleaseNotes exists (in a separate branch), so checks are added for each file
3738
if [ -d "$doc_dir" ]; then
39+
if [ -f "${doc_dir}/ReleaseNotes" ]; then
40+
cp "${doc_dir}/ReleaseNotes" "${stage_dir}"
41+
fi
42+
3843
if [ -f "${doc_dir}/LICENSE" ]; then
3944
cp "${doc_dir}/LICENSE" "${stage_dir}"
4045
fi

0 commit comments

Comments
 (0)