You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by jo...@apache.org on 2021/04/25 05:06:00 UTC
[arrow-datafusion] branch master updated: Remove hard coded
ballista versions. Fixes #32 (#49)
This is an automated email from the ASF dual-hosted git repository.
jorgecarleitao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow-datafusion.git
The following commit(s) were added to refs/heads/master by this push:
new fa99979 Remove hard coded ballista versions. Fixes #32 (#49)
fa99979 is described below
commit fa999799b65fc22abfada36955b0b0cc3ebf4c4f
Author: sathis <sa...@gmail.com>
AuthorDate: Sun Apr 25 10:35:52 2021 +0530
Remove hard coded ballista versions. Fixes #32 (#49)
Co-authored-by: Sathis Kumar <sa...@udemy.com>
---
benchmarks/tpch-gen.sh | 3 +--
dev/build-rust-base.sh | 3 ++-
dev/build-rust.sh | 3 +--
dev/{build-rust-base.sh => build-set-env.sh} | 5 ++---
dev/build-ui.sh | 3 +--
5 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/benchmarks/tpch-gen.sh b/benchmarks/tpch-gen.sh
index fef3480..3cef3bd 100755
--- a/benchmarks/tpch-gen.sh
+++ b/benchmarks/tpch-gen.sh
@@ -16,10 +16,9 @@
# specific language governing permissions and limitations
# under the License.
-BALLISTA_VERSION=0.5.0-SNAPSHOT
-
#set -e
+. ./dev/build-set-env.sh
docker build -t ballistacompute/ballista-tpchgen:$BALLISTA_VERSION -f tpchgen.dockerfile .
# Generate data into the ./data directory if it does not already exist
diff --git a/dev/build-rust-base.sh b/dev/build-rust-base.sh
index 1bedbd8..f2a4cc3 100755
--- a/dev/build-rust-base.sh
+++ b/dev/build-rust-base.sh
@@ -16,6 +16,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-BALLISTA_VERSION=0.5.0-SNAPSHOT
set -e
+
+. ./dev/build-set-env.sh
docker build -t ballistacompute/rust-base:$BALLISTA_VERSION -f dev/docker/rust-base.dockerfile .
diff --git a/dev/build-rust.sh b/dev/build-rust.sh
index 5777d1e..479cb2a 100755
--- a/dev/build-rust.sh
+++ b/dev/build-rust.sh
@@ -17,8 +17,7 @@
# specific language governing permissions and limitations
# under the License.
-BALLISTA_VERSION=0.5.0-SNAPSHOT
-
set -e
+. ./dev/build-set-env.sh
docker build -t ballistacompute/ballista-rust:$BALLISTA_VERSION -f dev/docker/rust.dockerfile .
diff --git a/dev/build-rust-base.sh b/dev/build-set-env.sh
similarity index 85%
copy from dev/build-rust-base.sh
copy to dev/build-set-env.sh
index 1bedbd8..3eb29e7 100755
--- a/dev/build-rust-base.sh
+++ b/dev/build-set-env.sh
@@ -16,6 +16,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-BALLISTA_VERSION=0.5.0-SNAPSHOT
-set -e
-docker build -t ballistacompute/rust-base:$BALLISTA_VERSION -f dev/docker/rust-base.dockerfile .
+
+export BALLISTA_VERSION=$(awk -F'[ ="]+' '$1 == "version" { print $2 }' ballista/rust/core/Cargo.toml)
diff --git a/dev/build-ui.sh b/dev/build-ui.sh
index d39d610..bb5bff3 100755
--- a/dev/build-ui.sh
+++ b/dev/build-ui.sh
@@ -17,8 +17,7 @@
# specific language governing permissions and limitations
# under the License.
-BALLISTA_VERSION=0.4.2-SNAPSHOT
-
set -e
+. ./dev/build-set-env.sh
docker build -t ballistacompute/ballista-scheduler-ui:$BALLISTA_VERSION -f dev/docker/ui.scheduler.dockerfile ballista/ui/scheduler