Skip to content

Commit

Permalink
testing ci changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Omega359 committed Dec 18, 2024
1 parent 1c09b91 commit dacd2a5
Show file tree
Hide file tree
Showing 12 changed files with 101 additions and 66 deletions.
4 changes: 2 additions & 2 deletions .github/actions/setup-macos-aarch64-builder/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ runs:
run: |
mkdir -p $HOME/d/protoc
cd $HOME/d/protoc
export PROTO_ZIP="protoc-21.4-osx-aarch_64.zip"
curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v21.4/$PROTO_ZIP
export PROTO_ZIP="protoc-29.1-osx-aarch_64.zip"
curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v29.1/$PROTO_ZIP
unzip $PROTO_ZIP
echo "$HOME/d/protoc/bin" >> $GITHUB_PATH
export PATH=$PATH:$HOME/d/protoc/bin
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/setup-macos-builder/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ runs:
run: |
mkdir -p $HOME/d/protoc
cd $HOME/d/protoc
export PROTO_ZIP="protoc-21.4-osx-x86_64.zip"
curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v21.4/$PROTO_ZIP
export PROTO_ZIP="protoc-29.1-osx-x86_64.zip"
curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v29.1/$PROTO_ZIP
unzip $PROTO_ZIP
echo "$HOME/d/protoc/bin" >> $GITHUB_PATH
export PATH=$PATH:$HOME/d/protoc/bin
Expand Down
2 changes: 2 additions & 0 deletions .github/actions/setup-rust-runtime/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ runs:
steps:
- name: Run sccache-cache
uses: mozilla-actions/[email protected]
- name: Run rust cache
uses: Swatinem/rust-cache@v2
- name: Configure runtime env
shell: bash
# do not produce debug symbols to keep memory usage down
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/setup-windows-builder/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ runs:
run: |
mkdir -p $HOME/d/protoc
cd $HOME/d/protoc
export PROTO_ZIP="protoc-21.4-win64.zip"
curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v21.4/$PROTO_ZIP
export PROTO_ZIP="protoc-29.1-win64.zip"
curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v29.1/$PROTO_ZIP
unzip $PROTO_ZIP
export PATH=$PATH:$HOME/d/protoc/bin
protoc.exe --version
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: true
fetch-depth: 1
- name: Setup Rust toolchain
uses: ./.github/actions/setup-builder
with:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/docs_pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: true
fetch-depth: 1
- name: Setup Rust toolchain
uses: ./.github/actions/setup-builder
with:
Expand Down
127 changes: 72 additions & 55 deletions .github/workflows/rust.yml

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,13 @@ overflow-checks = false
panic = 'unwind'
rpath = false

# ci turns off debug info to allow for smaller binaries making caching more effective
[profile.ci]
inherits = "dev"
debug = 0
strip = "debuginfo"
incremental = false

[workspace.lints.clippy]
# Detects large stack-allocated futures that may cause stack overflow crashes (see threshold in clippy.toml)
large_futures = "warn"
Expand Down
4 changes: 2 additions & 2 deletions ci/scripts/rust_docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@

set -ex
export RUSTDOCFLAGS="-D warnings"
cargo doc --document-private-items --no-deps --workspace
cargo doc --profile ci --document-private-items --no-deps --workspace
cd datafusion-cli
cargo doc --document-private-items --no-deps
cargo doc --profile ci --document-private-items --no-deps
4 changes: 2 additions & 2 deletions ci/scripts/rust_example.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@

set -ex
cd datafusion-examples/examples/
cargo check --examples
cargo check --profile ci --examples

files=$(ls .)
for filename in $files
do
example_name=`basename $filename ".rs"`
# Skip tests that rely on external storage and flight
if [ ! -d $filename ]; then
cargo run --example $example_name
cargo run --profile ci --example $example_name
cargo clean -p datafusion-examples
fi
done
7 changes: 7 additions & 0 deletions datafusion-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,10 @@ assert_cmd = "2.0"
ctor = "0.2.0"
predicates = "3.0"
rstest = "0.22"

# ci turns off debug info to allow for smaller binaries making caching more effective
[profile.ci]
inherits = "dev"
debug = 0
strip = "debuginfo"
incremental = false
2 changes: 1 addition & 1 deletion dev/depcheck/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
This directory contains a tool that ensures there are no circular dependencies
in the DataFusion codebase.

Specifically, it checks that no create's tests depend on another crate which
Specifically, it checks that no crate's tests depend on another crate which
depends on the first, which prevents publishing to crates.io, for example

[issue 9272]: https://github.com/apache/datafusion/issues/9277:

0 comments on commit dacd2a5

Please sign in to comment.