Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

release target: Fix tarball so it contains the distribution name #11727

Merged
merged 1 commit into from
Aug 20, 2024
Merged

release target: Fix tarball so it contains the distribution name #11727

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,18 +847,18 @@ add_custom_target(
COMMENT "Create distribution tarball for ASF"
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
COMMAND rm -rf ${DISTTMP} && mkdir /tmp/asf-dist
COMMAND git archive --format=tar HEAD | tar -C ${DISTTMP} -xf -
COMMAND rm -rf ${DISTTMP}/ci
COMMAND grep -v img.shields.io ${DISTTMP}/README.md > ${DISTTMP}/README.md.clean
COMMAND mv ${DISTTMP}/README.md.clean ${DISTTMP}/README.md
COMMAND git archive --format=tar --prefix=${DISTFILENAME}/ HEAD | tar -C ${DISTTMP} -xf -
COMMAND rm -rf ${DISTTMP}/${DISTFILENAME}/ci
COMMAND grep -v img.shields.io ${DISTTMP}/${DISTFILENAME}/README.md > ${DISTTMP}/${DISTFILENAME}/README.md.clean
COMMAND mv ${DISTTMP}/${DISTFILENAME}/README.md.clean ${DISTTMP}/${DISTFILENAME}/README.md
)

add_custom_target(
asf-dist
COMMENT "Create distribution tarball for ASF release"
DEPENDS asf-distdir
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
COMMAND tar -C ${DISTTMP} -c . | bzip2 -9 -c > ${DISTFILENAME}.tar.bz2
COMMAND tar -C ${DISTTMP} -c ${DISTFILENAME} | bzip2 -9 -c > ${DISTFILENAME}.tar.bz2
COMMAND rm -rf ${DISTTMP}
)

Expand All @@ -867,7 +867,7 @@ add_custom_target(
COMMENT "Create distribution tarball for ASF release candidate"
DEPENDS asf-distdir
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
COMMAND tar -C ${DISTTMP} -c . | bzip2 -9 -c > ${DISTFILENAME}-rc$ENV{RC}.tar.bz2
COMMAND tar -C ${DISTTMP} -c ${DISTFILENAME} | bzip2 -9 -c > ${DISTFILENAME}-rc$ENV{RC}.tar.bz2
COMMAND rm -rf ${DISTTMP}
)

Expand Down