You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ag...@apache.org on 2022/06/02 21:29:22 UTC
[arrow-datafusion] branch master updated: Remove Ballista CI check (#2684)
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-datafusion.git
The following commit(s) were added to refs/heads/master by this push:
new 2e129aaee Remove Ballista CI check (#2684)
2e129aaee is described below
commit 2e129aaee76b8a65379911ecbf98d88d7bdfbdbd
Author: Andy Grove <ag...@apache.org>
AuthorDate: Thu Jun 2 15:29:17 2022 -0600
Remove Ballista CI check (#2684)
* Remove Ballista CI check
* update PR template
---
.github/pull_request_template.md | 20 ----------------
.github/workflows/rust.yml | 45 ----------------------------------
dev/build-arrow-ballista.sh | 34 --------------------------
dev/make-ballista-deps-local.py | 52 ----------------------------------------
4 files changed, 151 deletions(-)
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 2c740dede..18b90943f 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
<!--
If there are any breaking changes to public APIs, please add the `api change` label.
--->
-
-# Does this PR break compatibility with Ballista?
-
-<!--
-The CI checks will attempt to build [arrow-ballista](https://github.com/apache/arrow-ballista) against this PR. If
-this check fails then it indicates that this PR makes a breaking change to the DataFusion API.
-
-If possible, try to make the change in a way that is not a breaking API change. For example, if code has moved
- around, try adding `pub use` from the original location to preserve the current API.
-
-If it is not possible to avoid a breaking change (such as when adding enum variants) then follow this process:
-
-- Make a corresponding PR against `arrow-ballista` with the changes required there
-- Update `dev/build-arrow-ballista.sh` to clone the appropriate `arrow-ballista` repo & branch
-- Merge this PR when CI passes
-- Merge the Ballista PR
-- Create a new PR here to reset `dev/build-arrow-ballista.sh` to point to `arrow-ballista` master again
-
-_If you would like to help improve this process, please see https://github.com/apache/arrow-datafusion/issues/2583_
-->
\ No newline at end of file
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index c40920239..a9c6effd5 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 82c0be109..000000000
--- 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 871b413f1..000000000
--- 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