Merge branch 'v8_1' into v9_0

Xilinx-CNS · Oct 4, 2024 · a0017fa · a0017fa
2 parents 6fb9bc8 + 64015da
commit a0017fa
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/ci/test.groovy b/ci/test.groovy
@@ -184,6 +184,7 @@ nm.slack_notify() {
         archiveArtifacts(artifacts: '*.tgz')
         archiveArtifacts(artifacts: '*.md5')
         archiveArtifacts(artifacts: '*.txt')
+        sh 'rm *ReleaseNotes.txt'
         stash name: 'text_files', includes: '*.txt'
         zip_and_archive_files(
           "tcpdirect-${tcpdirect_version_long}-tarball-doxbox.zip",

diff --git a/scripts/tcpdirect_misc/tcpdirect-extract-notes b/scripts/tcpdirect_misc/tcpdirect-extract-notes
@@ -26,6 +26,12 @@ else
     err "No Changelog file found in Tarball"
 fi
 
+if [ -f "$dir/ReleaseNotes" ]; then
+    try mv "$dir/ReleaseNotes" "$dst/$dir-ReleaseNotes.txt"
+else
+    err "No ReleaseNotes file found in Tarball"
+fi
+
 if [ -f "$dir/LICENSE" ]; then
     try mv "$dir/LICENSE" "$dst/$dir-LICENSE.txt"
 else

diff --git a/scripts/zf_make_tarball b/scripts/zf_make_tarball
@@ -34,7 +34,12 @@ make_release_package() {
     fi
 
     # Add documents to tarball
+    # Currently only ReleaseNotes exists (in a separate branch), so checks are added for each file
     if [ -d "$doc_dir" ]; then
+        if [ -f "${doc_dir}/ReleaseNotes" ]; then
+            cp "${doc_dir}/ReleaseNotes" "${stage_dir}"
+        fi
+
         if [ -f "${doc_dir}/LICENSE" ]; then
             cp "${doc_dir}/LICENSE" "${stage_dir}"
         fi