From 53c3a2084e7656e627f6f414dc9da5e95c11714b Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Thu, 13 Jun 2019 15:44:21 -0700 Subject: [PATCH] Makevars.win is dynamically generated now, no need to tweak it in the release script --- dev/release/00-prepare-test.rb | 14 -------------- dev/release/00-prepare.sh | 8 -------- 2 files changed, 22 deletions(-) diff --git a/dev/release/00-prepare-test.rb b/dev/release/00-prepare-test.rb index 8a1936d773542..8ce8ca1bfc2ff 100644 --- a/dev/release/00-prepare-test.rb +++ b/dev/release/00-prepare-test.rb @@ -130,13 +130,6 @@ def test_update_version_pre_tag "+Version: #{@release_version}"], ], }, - { - path: "r/src/Makevars.win", - hunks: [ - ["-VERSION = #{@previous_version}.9000", - "+VERSION = #{@release_version}"], - ], - }, { path: "ruby/red-arrow-cuda/lib/arrow-cuda/version.rb", hunks: [ @@ -279,13 +272,6 @@ def test_update_version_post_tag "+Version: #{@release_version}.9000"], ], }, - { - path: "r/src/Makevars.win", - hunks: [ - ["-VERSION = #{@release_version}", - "+VERSION = #{@release_version}.9000"], - ], - }, { path: "ruby/red-arrow-cuda/lib/arrow-cuda/version.rb", hunks: [ diff --git a/dev/release/00-prepare.sh b/dev/release/00-prepare.sh index 724df83ecd972..f9b891fe99fbf 100755 --- a/dev/release/00-prepare.sh +++ b/dev/release/00-prepare.sh @@ -101,14 +101,6 @@ update_versions() { git add DESCRIPTION cd - - cd "${SOURCE_DIR}/../../r/src" - sed -i.bak -E -e \ - "s/^VERSION = .+/VERSION = ${r_version}/" \ - Makevars.win - rm -f Makevars.win.bak - git add Makevars.win - cd - - cd "${SOURCE_DIR}/../../ruby" sed -i.bak -E -e \ "s/^ VERSION = \".+\"/ VERSION = \"${version}\"/g" \