From 3db81a788e56a5b44bb5131a0f460afe402cd814 Mon Sep 17 00:00:00 2001 From: Alexandr Romanenko Date: Mon, 7 Aug 2023 17:44:05 +0300 Subject: [PATCH] fix --- .github/workflows/python_build.yml | 3 ++- .github/workflows/python_test.yaml | 4 ++-- .github/workflows/rust.yml | 10 +++++----- datafusion-cli/Cargo.toml | 2 +- datafusion-examples/Cargo.toml | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/python_build.yml b/.github/workflows/python_build.yml index d262ef22edb7..67fb20323fd7 100644 --- a/.github/workflows/python_build.yml +++ b/.github/workflows/python_build.yml @@ -39,7 +39,8 @@ jobs: - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2021-07-04 + toolchain: nightly-2023-01-29 + - name: Install dependencies run: | diff --git a/.github/workflows/python_test.yaml b/.github/workflows/python_test.yaml index 456a5c47491d..dfbf482723d9 100644 --- a/.github/workflows/python_test.yaml +++ b/.github/workflows/python_test.yaml @@ -26,8 +26,8 @@ jobs: - uses: actions/checkout@v2 - name: Setup Rust toolchain run: | - rustup toolchain install nightly-2021-07-04 - rustup default nightly-2021-07-04 + rustup toolchain install nightly-2023-01-29 + rustup default nightly-2023-01-29 rustup component add rustfmt - name: Cache Cargo uses: actions/cache@v2 diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index ce96debe3c3e..9298ccbc2c8e 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -30,7 +30,7 @@ jobs: strategy: matrix: arch: [amd64] - rust: [nightly-2022-06-22] + rust: [nightly-2023-01-29] container: image: ${{ matrix.arch }}/rust env: @@ -73,7 +73,7 @@ jobs: strategy: matrix: arch: [amd64] - rust: [nightly-2022-06-22] + rust: [nightly-2023-01-29] container: image: ${{ matrix.arch }}/rust env: @@ -199,7 +199,7 @@ jobs: strategy: matrix: os: [macos-latest] - rust: [nightly-2022-06-22] + rust: [nightly-2023-01-29] steps: - uses: actions/checkout@v2 with: @@ -230,8 +230,8 @@ jobs: - uses: actions/checkout@v2 - name: Setup toolchain run: | - rustup toolchain install nightly-2022-06-22 - rustup default nightly-2022-06-22 + rustup toolchain install nightly-2023-01-29 + rustup default nightly-2023-01-29 rustup component add rustfmt - name: Run run: cargo fmt --all -- --check diff --git a/datafusion-cli/Cargo.toml b/datafusion-cli/Cargo.toml index 541c42c6c76d..d8a2dd243d0f 100644 --- a/datafusion-cli/Cargo.toml +++ b/datafusion-cli/Cargo.toml @@ -31,4 +31,4 @@ clap = "2.33" rustyline = "8.0" tokio = { version = "1.0", features = ["macros", "rt", "rt-multi-thread", "sync"] } datafusion = { path = "../datafusion" } -arrow = { git = "https://github.com/cube-js/arrow-rs.git", branch = "cube", features = ["prettyprint"] } +arrow = { git = "https://github.com/cube-js/arrow-rs.git", branch = "int96-types", features = ["prettyprint"] } diff --git a/datafusion-examples/Cargo.toml b/datafusion-examples/Cargo.toml index 26cdcde3a2dc..23cadcdd4b10 100644 --- a/datafusion-examples/Cargo.toml +++ b/datafusion-examples/Cargo.toml @@ -29,7 +29,7 @@ publish = false [dev-dependencies] -arrow-flight = { git = "https://github.com/cube-js/arrow-rs.git", branch = "cube" } +arrow-flight = { git = "https://github.com/cube-js/arrow-rs.git", branch = "int96-types" } datafusion = { path = "../datafusion" } prost = "0.7" smallvec = { version = "1.6", features = ["union"] }