Skip to content

Commit 141aed5

Browse files
authored
use nightly-2021-09-07 for python builds (#978)
* use nightly-2021-09-06 * use nightly-2021-09-07
1 parent 75fc80c commit 141aed5

File tree

6 files changed

+62
-64
lines changed

6 files changed

+62
-64
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ FEDORA=33
4747
PYTHON=3.6
4848
LLVM=11
4949
CLANG_TOOLS=8
50-
RUST=nightly-2021-05-10
50+
RUST=nightly-2021-09-07
5151
GO=1.15
5252
NODE=14
5353
MAVEN=3.5.4

.github/workflows/python_build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ name: Python Release Build
1919
on:
2020
push:
2121
tags:
22-
- '*-rc*'
22+
- "*-rc*"
2323

2424
defaults:
2525
run:
@@ -43,7 +43,7 @@ jobs:
4343

4444
- uses: actions-rs/toolchain@v1
4545
with:
46-
toolchain: nightly-2021-05-10
46+
toolchain: nightly-2021-09-07
4747

4848
- name: Install dependencies
4949
run: |

.github/workflows/python_test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
- uses: actions/checkout@v2
2626
- name: Setup Rust toolchain
2727
run: |
28-
rustup toolchain install nightly-2021-05-10
29-
rustup default nightly-2021-05-10
28+
rustup toolchain install nightly-2021-09-07
29+
rustup default nightly-2021-09-07
3030
rustup component add rustfmt
3131
- name: Cache Cargo
3232
uses: actions/cache@v2

.github/workflows/rust.yml

Lines changed: 38 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ jobs:
284284
strategy:
285285
matrix:
286286
arch: [amd64]
287-
rust: [nightly-2021-03-24]
287+
rust: [nightly-2021-09-07]
288288
steps:
289289
- uses: actions/checkout@v2
290290
with:
@@ -312,7 +312,6 @@ jobs:
312312
# Ignore MIRI errors until we can get a clean run
313313
cargo miri test || true
314314
315-
316315
# Check answers are correct when hash values collide
317316
hash-collisions:
318317
name: Test Hash Collisions on AMD64 Rust ${{ matrix.rust }}
@@ -359,44 +358,43 @@ jobs:
359358
env:
360359
CARGO_HOME: "/github/home/.cargo"
361360
CARGO_TARGET_DIR: "/github/home/target"
362-
363361
# Coverage job was failing. https://github.com/apache/arrow-datafusion/issues/590 tracks re-instating it
364362

365-
# coverage:
366-
# name: Coverage
367-
# runs-on: ubuntu-latest
368-
# strategy:
369-
# matrix:
370-
# arch: [amd64]
371-
# rust: [stable]
372-
# steps:
373-
# - uses: actions/checkout@v2
374-
# with:
375-
# submodules: true
376-
# - name: Cache Cargo
377-
# uses: actions/cache@v2
378-
# with:
379-
# path: /home/runner/.cargo
380-
# # this key is not equal because the user is different than on a container (runner vs github)
381-
# key: cargo-coverage-cache-
382-
# - name: Cache Rust dependencies
383-
# uses: actions/cache@v2
384-
# with:
385-
# path: /home/runner/target
386-
# # this key is not equal because coverage uses different compilation flags.
387-
# key: ${{ runner.os }}-${{ matrix.arch }}-target-coverage-cache-${{ matrix.rust }}-
388-
# - name: Run coverage
389-
# run: |
390-
# export ARROW_TEST_DATA=$(pwd)/testing/data
391-
# export PARQUET_TEST_DATA=$(pwd)/parquet-testing/data
363+
# coverage:
364+
# name: Coverage
365+
# runs-on: ubuntu-latest
366+
# strategy:
367+
# matrix:
368+
# arch: [amd64]
369+
# rust: [stable]
370+
# steps:
371+
# - uses: actions/checkout@v2
372+
# with:
373+
# submodules: true
374+
# - name: Cache Cargo
375+
# uses: actions/cache@v2
376+
# with:
377+
# path: /home/runner/.cargo
378+
# # this key is not equal because the user is different than on a container (runner vs github)
379+
# key: cargo-coverage-cache-
380+
# - name: Cache Rust dependencies
381+
# uses: actions/cache@v2
382+
# with:
383+
# path: /home/runner/target
384+
# # this key is not equal because coverage uses different compilation flags.
385+
# key: ${{ runner.os }}-${{ matrix.arch }}-target-coverage-cache-${{ matrix.rust }}-
386+
# - name: Run coverage
387+
# run: |
388+
# export ARROW_TEST_DATA=$(pwd)/testing/data
389+
# export PARQUET_TEST_DATA=$(pwd)/parquet-testing/data
392390

393-
# # 2020-11-15: There is a cargo-tarpaulin regression in 0.17.0
394-
# # see https://github.com/xd009642/tarpaulin/issues/618
395-
# cargo install --version 0.16.0 cargo-tarpaulin
396-
# cargo tarpaulin --out Xml
397-
# env:
398-
# CARGO_HOME: "/home/runner/.cargo"
399-
# CARGO_TARGET_DIR: "/home/runner/target"
400-
# - name: Report coverage
401-
# continue-on-error: true
402-
# run: bash <(curl -s https://codecov.io/bash)
391+
# # 2020-11-15: There is a cargo-tarpaulin regression in 0.17.0
392+
# # see https://github.com/xd009642/tarpaulin/issues/618
393+
# cargo install --version 0.16.0 cargo-tarpaulin
394+
# cargo tarpaulin --out Xml
395+
# env:
396+
# CARGO_HOME: "/home/runner/.cargo"
397+
# CARGO_TARGET_DIR: "/home/runner/target"
398+
# - name: Report coverage
399+
# continue-on-error: true
400+
# run: bash <(curl -s https://codecov.io/bash)

ci/docker/linux-apt-lint.dockerfile

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@ FROM ${base}
2222
ARG clang_tools
2323
RUN apt-get update && \
2424
apt-get install -y -q \
25-
clang-${clang_tools} \
26-
clang-format-${clang_tools} \
27-
clang-tidy-${clang_tools} \
28-
clang-tools-${clang_tools} \
29-
cmake \
30-
curl \
31-
libclang-${clang_tools}-dev \
32-
llvm-${clang_tools}-dev \
33-
openjdk-11-jdk-headless \
34-
python3 \
35-
python3-dev \
36-
python3-pip \
37-
ruby \
25+
clang-${clang_tools} \
26+
clang-format-${clang_tools} \
27+
clang-tidy-${clang_tools} \
28+
clang-tools-${clang_tools} \
29+
cmake \
30+
curl \
31+
libclang-${clang_tools}-dev \
32+
llvm-${clang_tools}-dev \
33+
openjdk-11-jdk-headless \
34+
python3 \
35+
python3-dev \
36+
python3-pip \
37+
ruby \
3838
&& apt-get clean \
3939
&& rm -rf /var/lib/apt/lists/*
4040

@@ -46,7 +46,7 @@ COPY ci/scripts/install_iwyu.sh /arrow/ci/scripts/
4646
RUN arrow/ci/scripts/install_iwyu.sh /tmp/iwyu /usr/local ${clang_tools}
4747

4848
# Rust linter
49-
ARG rust=nightly-2021-03-24
49+
ARG rust=nightly-2021-09-07
5050
RUN curl https://sh.rustup.rs -sSf | \
5151
sh -s -- --default-toolchain stable -y
5252
ENV PATH /root/.cargo/bin:$PATH
@@ -59,11 +59,11 @@ RUN ln -s /usr/bin/python3 /usr/local/bin/python && \
5959
ln -s /usr/bin/pip3 /usr/local/bin/pip
6060

6161
COPY dev/archery/requirements.txt \
62-
dev/archery/requirements-lint.txt \
63-
/arrow/dev/archery/
62+
dev/archery/requirements-lint.txt \
63+
/arrow/dev/archery/
6464
RUN pip install \
65-
-r arrow/dev/archery/requirements.txt \
66-
-r arrow/dev/archery/requirements-lint.txt
65+
-r arrow/dev/archery/requirements.txt \
66+
-r arrow/dev/archery/requirements-lint.txt
6767

6868
ENV LC_ALL=C.UTF-8 \
6969
LANG=C.UTF-8

python/rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2021-05-10
1+
nightly-2021-09-07

0 commit comments

Comments
 (0)