From a6a2a9a5167a3e8b00cf531b6ae7ac2b64593f2a Mon Sep 17 00:00:00 2001 From: Andy Grove Date: Thu, 2 Jun 2022 13:08:45 -0600 Subject: [PATCH 1/2] Remove Ballista CI check --- .github/workflows/rust.yml | 45 ---------------------------- dev/build-arrow-ballista.sh | 34 --------------------- dev/make-ballista-deps-local.py | 52 --------------------------------- 3 files changed, 131 deletions(-) delete mode 100755 dev/build-arrow-ballista.sh delete mode 100644 dev/make-ballista-deps-local.py diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index c409202392e8..a9c6effd52a6 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -125,51 +125,6 @@ jobs: CARGO_HOME: "/github/home/.cargo" CARGO_TARGET_DIR: "/github/home/target" - # run ballista tests - ballista-test: - name: Test Ballista on AMD64 Rust ${{ matrix.rust }} - needs: [linux-build-lib] - runs-on: ubuntu-latest - strategy: - matrix: - arch: [amd64] - rust: [stable] - container: - image: ${{ matrix.arch }}/rust - env: - # Disable full debug symbol generation to speed up CI build and keep memory down - # "1" means line tables only, which is useful for panic tracebacks. - RUSTFLAGS: "-C debuginfo=1" - steps: - - uses: actions/checkout@v2 - with: - submodules: true - - uses: actions/setup-python@v3 - with: - python-version: '3.x' - - name: Cache Cargo - uses: actions/cache@v3 - with: - path: /github/home/.cargo - # this key equals the ones on `linux-build-lib` for re-use - key: cargo-cache- - - name: Cache Rust dependencies - uses: actions/cache@v3 - with: - path: /github/home/target - # this key equals the ones on `linux-build-lib` for re-use - key: ${{ runner.os }}-${{ matrix.arch }}-target-cache-${{ matrix.rust }} - - name: Setup Rust toolchain - uses: ./.github/actions/setup-builder - with: - rust-version: ${{ matrix.rust }} - - name: Run tests - run: | - ./dev/build-arrow-ballista.sh - env: - CARGO_HOME: "/github/home/.cargo" - CARGO_TARGET_DIR: "/github/home/target" - integration-test: name: "Integration Test" needs: [linux-build-lib] diff --git a/dev/build-arrow-ballista.sh b/dev/build-arrow-ballista.sh deleted file mode 100755 index 82c0be1099fb..000000000000 --- a/dev/build-arrow-ballista.sh +++ /dev/null @@ -1,34 +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 - -# delete any previously cloned arrow-ballista repo -rm -rf arrow-ballista 2>/dev/null - -# clone the repo -# TODO make repo/branch configurable -git clone https://github.com/tustvold/arrow-ballista -b remove-object-store-plans - -# update dependencies to local crates -python ./dev/make-ballista-deps-local.py - -# test -cd arrow-ballista -cargo test \ No newline at end of file diff --git a/dev/make-ballista-deps-local.py b/dev/make-ballista-deps-local.py deleted file mode 100644 index 871b413f191b..000000000000 --- a/dev/make-ballista-deps-local.py +++ /dev/null @@ -1,52 +0,0 @@ -# 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. - -import glob -import os -from pathlib import Path - -datafusion_root = Path( __file__ ).parent.parent.absolute() - -# TODO we could do this dynamically and avoid hard-coding the crates and paths -crate_paths = { - "datafusion-cli": "datafusion-cli", - "datafusion": "datafusion/core", - "datafusion-common": "datafusion/common", - "datafusion-data-access": "datafusion/data-access", - "datafusion-expr": "datafusion/expr", - "datafusion-jit": "datafusion/jit", - "datafusion-physical-expr": "datafusion/physical-expr", - "datafusion-proto": "datafusion/proto", - "datafusion-row": "datafusion/row" -} - -toml_files = glob.glob("arrow-ballista/**/Cargo.toml", recursive=True) -for file in toml_files: - print('Updating {}'.format(file)) - toml = open(file, 'r') - lines = toml.readlines() - toml = open(file, 'w') - for line in lines: - pos = line.find('=') - if pos != -1: - crate = line[0:pos].strip() - if crate in crate_paths: - path = os.path.join(datafusion_root, crate_paths[crate]) - line = crate + " = { path = \"" + path + "\" }\n" - print("\tupdating to: {}".format(line)) - toml.write(line) - toml.close() \ No newline at end of file From 4998667b5a550a88fbd4b448d4f973d4eb636429 Mon Sep 17 00:00:00 2001 From: Andy Grove Date: Thu, 2 Jun 2022 13:10:12 -0600 Subject: [PATCH 2/2] update PR template --- .github/pull_request_template.md | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 2c740dedeeb8..18b90943fe82 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -24,24 +24,4 @@ If there are user-facing changes then we may require documentation to be updated - -# Does this PR break compatibility with Ballista? - - \ No newline at end of file