diff --git a/dev/release/02-source-test.rb b/dev/release/02-source-test.rb index eab95c798f284..3dec19326f92b 100644 --- a/dev/release/02-source-test.rb +++ b/dev/release/02-source-test.rb @@ -22,7 +22,7 @@ class SourceTest < Test::Unit::TestCase def setup @current_commit = git_current_commit detect_versions - @tag_name = "apache-arrow-#{@release_version}-rc0" + @tag_name_no_rc = "apache-arrow-#{@release_version}" @archive_name = "apache-arrow-#{@release_version}.tar.gz" @script = File.expand_path("dev/release/02-source.sh") @tarball_script = File.expand_path("dev/release/utils-create-release-tarball.sh") @@ -50,7 +50,7 @@ def source(*targets) def test_symbolic_links source - Dir.chdir(@tag_name) do + Dir.chdir(@tag_name_no_rc) do assert_equal([], Find.find(".").find_all {|path| File.symlink?(path)}) end @@ -58,7 +58,7 @@ def test_symbolic_links def test_csharp_git_commit_information source - Dir.chdir("#{@tag_name}/csharp") do + Dir.chdir("#{@tag_name_no_rc}/csharp") do FileUtils.mv("dummy.git", "../.git") sh("dotnet", "pack", "-c", "Release") FileUtils.mv("../.git", "dummy.git") @@ -83,7 +83,7 @@ def test_csharp_git_commit_information def test_python_version source - Dir.chdir("#{@tag_name}/python") do + Dir.chdir("#{@tag_name_no_rc}/python") do sh("python3", "setup.py", "sdist") if on_release_branch? pyarrow_source_archive = "dist/pyarrow-#{@release_version}.tar.gz" diff --git a/dev/release/utils-create-release-tarball.sh b/dev/release/utils-create-release-tarball.sh index 1a0ba83639b9a..0ca57ebe78c01 100755 --- a/dev/release/utils-create-release-tarball.sh +++ b/dev/release/utils-create-release-tarball.sh @@ -30,26 +30,27 @@ version=$1 rc=$2 tag=apache-arrow-${version}-rc${rc} +root_folder=apache-arrow-${version} tarball=apache-arrow-${version}.tar.gz : ${release_hash:=$(git rev-list --max-count=1 ${tag})} -rm -rf ${tag} +rm -rf ${root_folder} # be conservative and use the release hash, even though git produces the same # archive (identical hashes) using the scm tag (cd "${SOURCE_TOP_DIR}" && \ - git archive ${release_hash} --prefix ${tag}/) | \ + git archive ${release_hash} --prefix ${root_folder}/) | \ tar xf - # Resolve symbolic and hard links -rm -rf ${tag}.tmp -mv ${tag} ${tag}.tmp -cp -R -L ${tag}.tmp ${tag} -rm -rf ${tag}.tmp +rm -rf ${root_folder}.tmp +mv ${root_folder} ${root_folder}.tmp +cp -R -L ${root_folder}.tmp ${root_folder} +rm -rf ${root_folder}.tmp # Create a dummy .git/ directory to download the source files from GitHub with Source Link in C#. -dummy_git=${tag}/csharp/dummy.git +dummy_git=${root_folder}/csharp/dummy.git mkdir ${dummy_git} pushd ${dummy_git} echo ${release_hash} > HEAD @@ -58,5 +59,5 @@ mkdir objects refs popd # Create new tarball from modified source directory -tar czf ${tarball} ${tag} -rm -rf ${tag} +tar czf ${tarball} ${root_folder} +rm -rf ${root_folder}