Skip to content
This repository has been archived by the owner on Nov 22, 2023. It is now read-only.

Commit

Permalink
Merge branch 'main' into assets-all-load
Browse files Browse the repository at this point in the history
  • Loading branch information
alice-i-cecile authored Apr 22, 2023
2 parents d50748e + a57dbec commit 5b49e0e
Showing 2 changed files with 23 additions and 54 deletions.
73 changes: 20 additions & 53 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -13,68 +13,35 @@ env:
RUSTFLAGS: "-C debuginfo=0 -D warnings"

jobs:
check-lints:
checks:
runs-on: ubuntu-latest
strategy:
# Default is `true`
fail-fast: false
matrix:
ci-argument:
- clippy
- compilecheck
- doccheck
- doctest
- format
- test
include:
- ci-argument: clippy
toolchain-components: clippy
- ci-argument: format
toolchain-components: rustfmt
name: CI check (${{ matrix.ci-argument }})
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
components: rustfmt, clippy
components: ${{ matrix.toolchain-components || null }}
- name: Cache Cargo build files
uses: Leafwing-Studios/cargo-cache@v1.0.0
- name: Install alsa and udev
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
- name: CI job
# See tools/ci/src/main.rs for the commands this runs
run: cargo run -p ci -- lints

check-tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
- name: Cache Cargo build files
uses: Leafwing-Studios/cargo-cache@v1.0.0
- name: Install alsa and udev
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
- name: Build & run tests
# See tools/ci/src/main.rs for the commands this runs
run: cargo run -p ci -- test

check-compiles:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
- name: Cache Cargo build files
uses: Leafwing-Studios/cargo-cache@v1.0.0
- name: Install alsa and udev
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
- name: Check Compile
# See tools/ci/src/main.rs for the commands this runs
run: cargo run -p ci -- compile

check-doc:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
- name: Cache Cargo build files
uses: Leafwing-Studios/cargo-cache@v1.0.0
- name: Install alsa and udev
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
if: runner.os == 'linux'
- name: Build and check doc
# See tools/ci/src/main.rs for the commands this runs
run: cargo run -p ci -- doc
# - name: Installs cargo-deadlinks
# run: cargo install --force cargo-deadlinks
# - name: Checks dead links
# run: cargo deadlinks
run: cargo run -p ci -- ${{ matrix.ci-argument }}
4 changes: 3 additions & 1 deletion tools/ci/src/main.rs
Original file line number Diff line number Diff line change
@@ -7,6 +7,8 @@
//! - Local runs use whatever the default Rust is locally
use bevy::prelude::*;
use std::process;

use bevy::utils::HashSet;
use xshell::{cmd, Shell};

@@ -89,7 +91,7 @@ fn main() {
.collect::<Vec<&str>>()
.join(", "),
);
return;
process::exit(1);
}
} else {
Check::all()

0 comments on commit 5b49e0e

Please sign in to comment.