Skip to content

ARROW-5850: [CI][R] R appveyor job is broken after release #4805

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

Closed
nealrichardson wants to merge 1 commit into from
Closed

ARROW-5850: [CI][R] R appveyor job is broken after release #4805

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion ci/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
_realname=arrow
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=0.13.0.9000
pkgver=0.14.0.9000
pkgrel=8000
pkgdesc="Apache Arrow is a cross-language development platform for in-memory data (mingw-w64)"
arch=("any")
Expand Down Expand Up @@ -46,6 +46,8 @@ cmake_build_type=release
cpp_build_dir=build-${CARCH}-cpp

pkgver() {
# The only purpose of this here is to cause the job to error if the
# version in pkgver is different from what is in r/DESCRIPTION
cd "$source_dir"
grep Version r/DESCRIPTION | cut -d " " -f 2
}
Expand Down
14 changes: 14 additions & 0 deletions dev/release/00-prepare-test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,13 @@ def test_update_version_pre_tag
"+version = '#{@release_version}'"],
],
},
{
path: "ci/PKGBUILD",
hunks: [
["-pkgver=#{@previous_version}.9000",
"+pkgver=#{@release_version}"],
],
},
{
path: "cpp/CMakeLists.txt",
hunks: [
Expand Down Expand Up @@ -234,6 +241,13 @@ def test_update_version_post_tag
"+version = '#{@next_version}-SNAPSHOT'"],
],
},
{
path: "ci/PKGBUILD",
hunks: [
["-pkgver=#{@release_version}",
"+pkgver=#{@release_version}.9000"],
],
},
{
path: "cpp/CMakeLists.txt",
hunks: [
Expand Down
8 changes: 8 additions & 0 deletions dev/release/00-prepare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,14 @@ update_versions() {
git add DESCRIPTION
cd -

cd "${SOURCE_DIR}/../../ci"
sed -i.bak -E -e \
"s/^pkgver=.+/pkgver=${r_version}/" \
PKGBUILD
rm -f PKGBUILD.bak
git add PKGBUILD
cd -

cd "${SOURCE_DIR}/../../r"
if [ ${type} = "snapshot" ]; then
# Add a news entry for the new dev version
Expand Down