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 2021/04/18 15:32:10 UTC

[arrow-rs] branch ci-fix updated (bb31b83 -> c3f5186)

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

agrove pushed a change to branch ci-fix
in repository https://gitbox.apache.org/repos/asf/arrow-rs.git.


 discard bb31b83  Fixed CI.
     add c926952  Remove submodule
     add 28ee9a2  Add parquet-testing submodule
     add a9bcc92  Update paths to arrow and parquet test data
     new c3f5186  Fixed CI.

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (bb31b83)
            \
             N -- N -- N   refs/heads/ci-fix (c3f5186)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitmodules                 | 6 +++---
 arrow/src/util/test_util.rs | 4 ++--
 parquet-testing             | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)
 create mode 160000 parquet-testing

[arrow-rs] 01/01: Fixed CI.

Posted by ag...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit c3f51862e740565671fa99713db8745dcee4f8e8
Author: Jorge C. Leitao <jo...@gmail.com>
AuthorDate: Sun Apr 18 15:06:20 2021 +0000

    Fixed CI.
---
 .github/workflows/rust.yml | 30 ++++--------------------------
 .pre-commit-config.yaml    |  4 ++--
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 4bb17a2..ab3b8c0 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -70,16 +70,7 @@ jobs:
         run: |
           export CARGO_HOME="/github/home/.cargo"
           export CARGO_TARGET_DIR="/github/home/target"
-          cd rust
           cargo build
-      # Ballista is currently not part of the main workspace so requires a separate build step
-      - name: Build Ballista
-        run: |
-          export CARGO_HOME="/github/home/.cargo"
-          export CARGO_TARGET_DIR="/github/home/target"
-          cd rust/ballista/rust
-          # snmalloc requires cmake so build without default features
-          cargo build --no-default-features
 
   # test the crate
   linux-test:
@@ -123,7 +114,6 @@ jobs:
         run: |
           export CARGO_HOME="/github/home/.cargo"
           export CARGO_TARGET_DIR="/github/home/target"
-          cd rust
           # run tests on all workspace members with default feature list
           cargo test
           # test datafusion examples
@@ -139,14 +129,6 @@ jobs:
           cargo run --example dynamic_types
           cargo run --example read_csv
           cargo run --example read_csv_infer_schema
-      # Ballista is currently not part of the main workspace so requires a separate test step
-      - name: Run Ballista tests
-        run: |
-          export CARGO_HOME="/github/home/.cargo"
-          export CARGO_TARGET_DIR="/github/home/target"
-          cd rust/ballista/rust
-          # snmalloc requires cmake so build without default features
-          cargo test --no-default-features
 
   # test the --features "simd" of the arrow crate. This requires nightly.
   linux-test-simd:
@@ -188,7 +170,7 @@ jobs:
         run: |
           export CARGO_HOME="/github/home/.cargo"
           export CARGO_TARGET_DIR="/github/home/target"
-          cd rust/arrow
+          cd arrow
           cargo test --features "simd"
 
   windows-and-macos:
@@ -216,7 +198,6 @@ jobs:
           export PARQUET_TEST_DATA=$(pwd)/cpp/submodules/parquet-testing/data
           # do not produce debug symbols to keep memory usage down
           export RUSTFLAGS="-C debuginfo=0"
-          cd rust
           cargo test
 
   clippy:
@@ -258,7 +239,6 @@ jobs:
         run: |
           export CARGO_HOME="/github/home/.cargo"
           export CARGO_TARGET_DIR="/github/home/target"
-          cd rust
           cargo clippy --all-targets --workspace -- -D warnings -A clippy::redundant_field_names
 
   miri-checks:
@@ -290,7 +270,6 @@ jobs:
           RUST_LOG: 'trace'
         run: |
           export MIRIFLAGS="-Zmiri-disable-isolation"
-          cd rust
           cargo miri setup
           cargo clean
           # Ignore MIRI errors until we can get a clean run
@@ -330,7 +309,6 @@ jobs:
           # 2020-11-15: There is a cargo-tarpaulin regression in 0.17.0
           # see https://github.com/xd009642/tarpaulin/issues/618
           cargo install --version 0.16.0 cargo-tarpaulin
-          cd rust
           cargo tarpaulin --out Xml
       - name: Report coverage
         continue-on-error: true
@@ -373,7 +351,7 @@ jobs:
           export CARGO_HOME="/home/runner/.cargo"
           export CARGO_TARGET_DIR="/home/runner/target"
 
-          cd rust/arrow-pyarrow-integration-testing
+          cd arrow-pyarrow-integration-testing
 
           python -m venv venv
           source venv/bin/activate
@@ -423,7 +401,7 @@ jobs:
         run: |
           export CARGO_HOME="/github/home/.cargo"
           export CARGO_TARGET_DIR="/github/home/target"
-          cd rust/arrow
+          cd arrow
           cargo build --target wasm32-unknown-unknown
 
   # test the projects can build without default features
@@ -466,5 +444,5 @@ jobs:
         run: |
           export CARGO_HOME="/github/home/.cargo"
           export CARGO_TARGET_DIR="/github/home/target"
-          cd rust/arrow
+          cd arrow
           cargo check --all-targets --no-default-features
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9d2d2d8..5331a53 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -32,8 +32,8 @@ repos:
       - id: rustfmt
         name: Rust Format
         language: system
-        entry: bash -c "cd rust && cargo +stable fmt --all -- --check"
-        files: ^rust/.*\.rs$
+        entry: bash -c "cargo +stable fmt --all -- --check"
+        files: ^.*\.rs$
         types:
           - file
           - rust