[arrow-ballista] branch master updated: Remove outdated script and use evergreen version of rust (#597)

[ag...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

agrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow-ballista.git


The following commit(s) were added to refs/heads/master by this push:
     new 45034da7 Remove outdated script and use evergreen version of rust (#597)
45034da7 is described below

commit 45034da740e3a564b11990e1f14b29a23e4eee17
Author: Brent Gardner <br...@spaceandtime.io>
AuthorDate: Sat Jan 14 14:14:22 2023 -0700

    Remove outdated script and use evergreen version of rust (#597)
    
    * Remove outdated script and use evergreen version of rust
    
    * Use debian protobuf
---
 .github/workflows/rust.yml                         |  7 +------
 dev/build-ballista-docker.sh                       |  4 +---
 ...lista-rust.sh => build-ballista-executables.sh} |  4 ++++
 dev/build-ui.sh                                    | 23 ----------------------
 dev/docker/ballista-builder.Dockerfile             |  2 +-
 5 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index f4fa6bc6..52e46d6e 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -117,12 +117,7 @@ jobs:
       - name: Install protobuf compiler
         shell: bash
         run: |
-          mkdir -p $HOME/d/protoc
-          cd $HOME/d/protoc
-          export PROTO_ZIP="protoc-21.4-linux-x86_64.zip"
-          curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v21.4/$PROTO_ZIP
-          unzip $PROTO_ZIP
-          export PATH=$PATH:$HOME/d/protoc/bin
+          apt-get -qq update && apt-get -y -qq install protobuf-compiler
           protoc --version
       - name: Cache Cargo
         uses: actions/cache@v3
diff --git a/dev/build-ballista-docker.sh b/dev/build-ballista-docker.sh
index cead5e84..71f37fc8 100755
--- a/dev/build-ballista-docker.sh
+++ b/dev/build-ballista-docker.sh
@@ -21,9 +21,7 @@ set -e
 
 RELEASE_FLAG=${RELEASE_FLAG:=release}
 
-docker build -t ballista-builder --build-arg EXT_UID="$(id -u)" -f dev/docker/ballista-builder.Dockerfile .
-
-docker run -v $(pwd):/home/builder/workspace --env RELEASE_FLAG=$RELEASE_FLAG ballista-builder
+./dev/build-ballista-executables.sh
 
 docker-compose build
 
diff --git a/dev/build-ballista-rust.sh b/dev/build-ballista-executables.sh
similarity index 79%
rename from dev/build-ballista-rust.sh
rename to dev/build-ballista-executables.sh
index 16e5bf8c..4396e14d 100755
--- a/dev/build-ballista-rust.sh
+++ b/dev/build-ballista-executables.sh
@@ -21,6 +21,10 @@ set -e
 
 RELEASE_FLAG=${RELEASE_FLAG:=release}
 
+# TODO: it would be very nice if we could make CI work the exact same way so the build logic isn't duplicated
+
+# build a docker container in which to run the build - this is to make life easier for Windows & Mac users
 docker build -t ballista-builder --build-arg EXT_UID="$(id -u)" -f dev/docker/ballista-builder.Dockerfile .
 
+# run cargo & yarn builds inside the builder container
 docker run -v $(pwd):/home/builder/workspace --env RELEASE_FLAG=$RELEASE_FLAG ballista-builder
diff --git a/dev/build-ui.sh b/dev/build-ui.sh
deleted file mode 100755
index c7b0f2d9..00000000
--- a/dev/build-ui.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-set -e
-
-. ./dev/build-set-env.sh
-docker build -t ballista-scheduler-ui:$BALLISTA_VERSION -f dev/docker/ballista-scheduler-ui.Dockerfile ballista/scheduler/ui
diff --git a/dev/docker/ballista-builder.Dockerfile b/dev/docker/ballista-builder.Dockerfile
index e210e526..8ae2c22c 100644
--- a/dev/docker/ballista-builder.Dockerfile
+++ b/dev/docker/ballista-builder.Dockerfile
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-FROM rust:1.63.0-buster
+FROM rust:1-buster
 
 ARG EXT_UID