Skip to content

Commit

Permalink
Fix fmt + Mac CI jobs (#2287)
Browse files Browse the repository at this point in the history
* Fix coverage and mac jobs -- still need to fix windows

* try and fix coverage

* comment out coverage
  • Loading branch information
alamb committed Aug 2, 2022
1 parent 3e17891 commit 6b2c757
Showing 1 changed file with 71 additions and 47 deletions.
118 changes: 71 additions & 47 deletions .github/workflows/rust.yml
Expand Up @@ -28,33 +28,56 @@ on:
jobs:

# Check workspace wide compile and test with default features for
# mac and windows
windows-and-macos:
name: Test on ${{ matrix.os }} Rust ${{ matrix.rust }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ windows-latest, macos-latest ]
rust: [ stable ]
# mac
macos:
name: Test on Mac
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
with:
submodules: true
- name: Install protoc with brew
run: |
brew install protobuf
- name: Setup Rust toolchain
run: |
rustup toolchain install ${{ matrix.rust }} --no-self-update
rustup default ${{ matrix.rust }}
- name: Install Protoc
uses: arduino/setup-protoc@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
rustup toolchain install stable --no-self-update
rustup default stable
- name: Run tests
shell: bash
run: |
# do not produce debug symbols to keep memory usage down
export RUSTFLAGS="-C debuginfo=0"
cargo test
# Commented out while fixed in https://github.com/apache/arrow-rs/issues/2279
#
# # Check workspace wide compile and test with default features for
# # windows
# windows:
# name: Test on Windows
# runs-on: windows-latest
# steps:
# - uses: actions/checkout@v2
# with:
# submodules: true
# - name: Install protoc with NuGet
# run: |
# nuget.exe install Google.Protobuf -Version 3.21.4 -OutputDirectory d:\\proto
# nuget.exe install Grpc.Tools -Version 2.47.0 -OutputDirectory d:\\proto
# - name: Setup Rust toolchain
# run: |
# rustup toolchain install stable --no-self-update
# rustup default stable
# - name: Run tests
# shell: bash
# run: |
# # do not produce debug symbols to keep memory usage down
# export RUSTFLAGS="-C debuginfo=0"
# # This is where protoc is installed
# export PATH=$PATH:/d/proto/Grpc.Tools.2.47.0/tools/windows_x86
# cargo test


# Run cargo fmt for all crates
lint:
Expand All @@ -72,36 +95,37 @@ jobs:
- name: Run
run: cargo fmt --all -- --check

coverage:
name: Coverage
runs-on: ubuntu-latest
strategy:
matrix:
arch: [ amd64 ]
rust: [ stable ]
steps:
- uses: actions/checkout@v2
with:
submodules: true
- name: Setup Rust toolchain
run: |
rustup toolchain install ${{ matrix.rust }}
rustup default ${{ matrix.rust }}
- name: Install Protoc
uses: arduino/setup-protoc@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Cache Cargo
uses: actions/cache@v3
with:
path: /home/runner/.cargo
key: cargo-coverage-cache3-
- name: Run coverage
run: |
rustup toolchain install stable
rustup default stable
cargo install --version 0.18.2 cargo-tarpaulin
cargo tarpaulin --all --out Xml
- name: Report coverage
continue-on-error: true
run: bash <(curl -s https://codecov.io/bash)
# Commented out while fixed in https://github.com/apache/arrow-rs/issues/2279
#
# coverage:
# name: Coverage
# runs-on: ubuntu-latest
# # Note runs outside of a container
# # otherwise we get this error:
# # Failed to run tests: ASLR disable failed: EPERM: Operation not permitted
# steps:
# - uses: actions/checkout@v2
# with:
# submodules: true
# - name: Setup Rust toolchain
# run: |
# rustup toolchain install stable
# rustup default stable
# - name: Install protobuf compiler
# run: |
# sudo apt-get update
# sudo apt-get install -y protobuf-compiler
# - name: Cache Cargo
# uses: actions/cache@v3
# with:
# path: /home/runner/.cargo
# key: cargo-coverage-cache3-
# - name: Run coverage
# run: |
# rustup toolchain install stable
# rustup default stable
# cargo install --version 0.18.2 cargo-tarpaulin
# cargo tarpaulin --all --out Xml
# - name: Report coverage
# continue-on-error: true
# run: bash <(curl -s https://codecov.io/bash)

0 comments on commit 6b2c757

Please sign in to comment.