Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .github/workflows/rust-stability.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,16 @@ jobs:
with:
matrix: |
channel: ["stable", "beta", "nightly"]
crate: ["ninja-xtask", "ninja-build_rs"]

test:
needs: crates
strategy:
fail-fast: false
matrix: ${{ fromJson(needs.crates.outputs.matrix) }}
runs-on: ubuntu-latest
defaults:
run:
working-directory: ${{ matrix.crate }}
runs-on: ubuntu-latest
working-directory: ninja-xtask
steps:
- uses: actions/checkout@v7
- name: update rust
Expand All @@ -55,10 +54,10 @@ jobs:
strategy:
fail-fast: false
matrix: ${{ fromJson(needs.crates.outputs.matrix) }}
runs-on: ubuntu-latest
defaults:
run:
working-directory: ${{ matrix.crate }}
runs-on: ubuntu-latest
working-directory: ninja-xtask
steps:
- uses: actions/checkout@v7
- name: update rust
Expand Down
60 changes: 3 additions & 57 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,54 +24,27 @@ jobs:
with:
concurrent_skipping: 'same_content_newer'

# indirection needed as fromJson will not read env context in matrix strategy
crates:
needs: skip_check
if: needs.skip_check.outputs.should_skip != 'true'
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.setup-matrix.outputs.matrix }}
steps:
- id: setup-matrix
uses: druzsan/setup-matrix@e52eed47b195a3c2157f91e1baceaa82df2276f2 #v2
with:
matrix: |
crate: ["ninja-xtask", "ninja-build_rs"]

test:
needs:
- skip_check
- crates
if: needs.skip_check.outputs.should_skip != 'true'
strategy:
fail-fast: false
matrix: ${{ fromJson(needs.crates.outputs.matrix) }}
defaults:
run:
working-directory: ${{ matrix.crate }}
working-directory: ninja-xtask
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v7
- name: Run tests
run: |
cargo test
cargo +nightly test
- name: Test fixture
if: ${{ matrix.crate == 'ninja-build_rs' }}
working-directory: ${{ matrix.crate }}/examples/assert_matches
run: ./test.sh

lint:
needs:
- skip_check
- crates
if: needs.skip_check.outputs.should_skip != 'true'
strategy:
fail-fast: false
matrix: ${{ fromJson(needs.crates.outputs.matrix) }}
defaults:
run:
working-directory: ${{ matrix.crate }}
working-directory: ninja-xtask
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v7
Expand All @@ -81,39 +54,12 @@ jobs:
fmt:
needs:
- skip_check
- crates
if: needs.skip_check.outputs.should_skip != 'true'
strategy:
fail-fast: false
matrix: ${{ fromJson(needs.crates.outputs.matrix) }}
defaults:
run:
working-directory: ${{ matrix.crate }}
working-directory: ninja-xtask
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v7
- name: fmt
run: cargo fmt --check

# msrv:
# needs:
# - skip_check
# - crates
# if: needs.skip_check.outputs.should_skip != 'true'
# strategy:
# fail-fast: false
# matrix: ${{ fromJson(needs.crates.outputs.matrix) }}
# defaults:
# run:
# working-directory: ${{ matrix.crate }}
# runs-on: ubuntu-latest
# env:
# RUSTC_BOOTSTRAP: 1
# steps:
# - uses: actions/checkout@v7
# - name: install cargo-msrv
# uses: taiki-e/install-action@v2.75.27
# with:
# tool: cargo-msrv
# - name: check MSRV
# run: cargo msrv verify
22 changes: 0 additions & 22 deletions ninja-build_rs/Cargo.toml

This file was deleted.

21 changes: 0 additions & 21 deletions ninja-build_rs/LICENSE

This file was deleted.

65 changes: 0 additions & 65 deletions ninja-build_rs/README.md

This file was deleted.

3 changes: 0 additions & 3 deletions ninja-build_rs/about.toml

This file was deleted.

12 changes: 0 additions & 12 deletions ninja-build_rs/examples/assert_matches/Cargo.toml

This file was deleted.

9 changes: 0 additions & 9 deletions ninja-build_rs/examples/assert_matches/build.rs

This file was deleted.

25 changes: 0 additions & 25 deletions ninja-build_rs/examples/assert_matches/src/lib.rs

This file was deleted.

8 changes: 0 additions & 8 deletions ninja-build_rs/examples/assert_matches/test.sh

This file was deleted.

3 changes: 0 additions & 3 deletions ninja-build_rs/rust-toolchain.toml

This file was deleted.

Loading