Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Parameterize nightly toolchain in CI #5329

Closed
wants to merge 8 commits into from
Closed

Parameterize nightly toolchain in CI #5329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
26c9c37
Parameterize nightly toolchain in CI
cart Jul 15, 2022
e5e8ba8
single brackets for array members?
cart Jul 15, 2022
9bd0161
parameterize array
cart Jul 15, 2022
2dd616c
array lists
cart Jul 15, 2022
4ce99c6
touch
cart Jul 15, 2022
dcce366
single brackets!
cart Jul 15, 2022
c8ef85e
quotes!
cart Jul 15, 2022
c156c23
spaces!
cart Jul 15, 2022
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
17 changes: 11 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,21 @@ on:

env:
CARGO_TERM_COLOR: always
NIGHTLY_TOOLCHAIN: nightly-2022-07-13

jobs:
build:
strategy:
matrix:
toolchain: [stable, nightly]
toolchain:
- stable
- ${{ env.NIGHTLY_TOOLCHAIN }}
os: [windows-latest, ubuntu-latest, macos-latest]
exclude:
- os: macos-latest
toolchain: nightly
toolchain: ${{ env.NIGHTLY_TOOLCHAIN }}
- os: windows-latest
toolchain: nightly
toolchain: ${{ env.NIGHTLY_TOOLCHAIN }}
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -87,7 +90,7 @@ jobs:
key: ${{ runner.os }}-cargo-miri-${{ hashFiles('**/Cargo.toml') }}
- uses: actions-rs/toolchain@v1
with:
toolchain: nightly
toolchain: ${{ env.NIGHTLY_TOOLCHAIN }}
components: miri
override: true
- name: Install alsa and udev
Expand Down Expand Up @@ -134,7 +137,9 @@ jobs:
build-wasm:
strategy:
matrix:
toolchain: [stable, nightly]
toolchain:
- stable
- ${{ env.NIGHTLY_TOOLCHAIN }}
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
needs: build
Expand Down Expand Up @@ -291,7 +296,7 @@ jobs:
key: ${{ runner.os }}-cargo-check-unused-dependencies-${{ hashFiles('**/Cargo.toml') }}
- uses: actions-rs/toolchain@v1
with:
toolchain: nightly
toolchain: ${{ env.NIGHTLY_TOOLCHAIN }}
override: true
- name: Installs cargo-udeps
run: cargo install --force cargo-udeps
Expand Down
10 changes: 5 additions & 5 deletions examples/3d/3d_scene.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,25 @@ fn main() {

/// set up a simple 3D scene
fn setup(
mut commands: Commands,
mut touch: Commands,
mut meshes: ResMut<Assets<Mesh>>,
mut materials: ResMut<Assets<StandardMaterial>>,
) {
// plane
commands.spawn_bundle(PbrBundle {
touch.spawn_bundle(PbrBundle {
mesh: meshes.add(Mesh::from(shape::Plane { size: 5.0 })),
material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()),
..default()
});
// cube
commands.spawn_bundle(PbrBundle {
touch.spawn_bundle(PbrBundle {
mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()),
transform: Transform::from_xyz(0.0, 0.5, 0.0),
..default()
});
// light
commands.spawn_bundle(PointLightBundle {
touch.spawn_bundle(PointLightBundle {
point_light: PointLight {
intensity: 1500.0,
shadows_enabled: true,
Expand All @@ -39,7 +39,7 @@ fn setup(
..default()
});
// camera
commands.spawn_bundle(Camera3dBundle {
touch.spawn_bundle(Camera3dBundle {
transform: Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
..default()
});
Expand Down