Skip to content

Commit 6a0b13a

Browse files
authored
Merge pull request #252 from YarnSpinnerTool/bevy-0.17.0-rc
Bump to Bevy 0.17.0 rc
2 parents 85ecb6a + 3d913fa commit 6a0b13a

File tree

38 files changed

+1728
-1034
lines changed

38 files changed

+1728
-1034
lines changed

.github/workflows/ci.yml

Lines changed: 50 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v4
2121
with:
22-
submodules: 'true'
23-
22+
submodules: "true"
23+
2424
- uses: dtolnay/rust-toolchain@master
2525
with:
2626
toolchain: stable
@@ -32,21 +32,20 @@ jobs:
3232
save-if: ${{ github.ref == 'refs/heads/main' }}
3333

3434
- name: Install alsa and udev
35-
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
35+
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
3636
- name: Run cargo clippy
3737
run: cargo clippy --workspace --all-features --tests --examples --exclude yarnspinner_without_bevy_examples -- --deny warnings
3838
- name: Run cargo clippy for non-bevy
3939
run: cargo clippy --no-default-features --tests -p yarnspinner -p yarnspinner_without_bevy_examples -- --deny warnings
4040

41-
4241
format:
4342
name: Format
4443
runs-on: ubuntu-latest
4544
timeout-minutes: 30
4645
steps:
4746
- uses: actions/checkout@v4
4847
with:
49-
submodules: 'true'
48+
submodules: "true"
5049
- uses: dtolnay/rust-toolchain@master
5150
with:
5251
toolchain: stable
@@ -61,7 +60,7 @@ jobs:
6160
steps:
6261
- uses: actions/checkout@v4
6362
with:
64-
submodules: 'true'
63+
submodules: "true"
6564

6665
- uses: dtolnay/rust-toolchain@master
6766
with:
@@ -73,7 +72,7 @@ jobs:
7372
save-if: ${{ github.ref == 'refs/heads/main' }}
7473

7574
- name: Install alsa and udev
76-
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
75+
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
7776
- name: Run cargo doc
7877
run: cargo doc --no-deps --workspace --all-features --exclude yarnspinner_without_bevy_examples
7978
- name: Run cargo doc for non-bevy
@@ -86,7 +85,7 @@ jobs:
8685
steps:
8786
- uses: actions/checkout@v4
8887
with:
89-
submodules: 'true'
88+
submodules: "true"
9089

9190
- uses: dtolnay/rust-toolchain@master
9291
with:
@@ -98,9 +97,30 @@ jobs:
9897
save-if: ${{ github.ref == 'refs/heads/main' }}
9998

10099
- name: Install alsa and udev
101-
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
100+
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
102101
- name: Run cargo test
103-
run: cargo test --workspace --all-features --exclude yarnspinner_without_bevy_examples
102+
run: cargo test --workspace --lib --bins --tests --examples --exclude yarnspinner_without_bevy_examples
103+
104+
test-bevy-docs:
105+
name: Test Docs with Bevy
106+
runs-on: ubuntu-latest
107+
timeout-minutes: 30
108+
steps:
109+
- uses: actions/checkout@v4
110+
with:
111+
submodules: "true"
112+
113+
- uses: dtolnay/rust-toolchain@master
114+
with:
115+
toolchain: stable
116+
117+
- name: Populate target directory from cache
118+
uses: Swatinem/rust-cache@v2
119+
with:
120+
save-if: ${{ github.ref == 'refs/heads/main' }}
121+
122+
- name: Install alsa and udev
123+
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
104124
- name: Run doc tests
105125
run: LD_LIBRARY_PATH="$(rustc --print target-libdir)" cargo test --workspace --all-features --doc --exclude yarnspinner_without_bevy_examples
106126

@@ -111,7 +131,7 @@ jobs:
111131
steps:
112132
- uses: actions/checkout@v4
113133
with:
114-
submodules: 'true'
134+
submodules: "true"
115135

116136
- uses: dtolnay/rust-toolchain@master
117137
with:
@@ -123,7 +143,7 @@ jobs:
123143
save-if: ${{ github.ref == 'refs/heads/main' }}
124144

125145
- name: Install alsa and udev
126-
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
146+
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
127147
- name: Run cargo test for non-bevy
128148
run: cargo test --no-default-features -p yarnspinner -p yarnspinner_without_bevy_examples
129149
- name: Run doc tests for non-bevy
@@ -134,26 +154,26 @@ jobs:
134154
runs-on: ubuntu-latest
135155
timeout-minutes: 30
136156
steps:
137-
- name: Checkout repository
138-
uses: actions/checkout@v4
157+
- name: Checkout repository
158+
uses: actions/checkout@v4
139159

140-
- name: Install Rust toolchain
141-
uses: dtolnay/rust-toolchain@stable
142-
with:
143-
targets: wasm32-unknown-unknown
160+
- name: Install Rust toolchain
161+
uses: dtolnay/rust-toolchain@stable
162+
with:
163+
targets: wasm32-unknown-unknown
144164

145-
- name: Install dependencies
146-
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
165+
- name: Install dependencies
166+
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
147167

148-
- name: Populate target directory from cache
149-
uses: Swatinem/rust-cache@v2
150-
with:
151-
save-if: ${{ github.ref == 'refs/heads/main' }}
168+
- name: Populate target directory from cache
169+
uses: Swatinem/rust-cache@v2
170+
with:
171+
save-if: ${{ github.ref == 'refs/heads/main' }}
152172

153-
- name: Install Bevy CLI
154-
run: cargo install --git=https://github.com/TheBevyFlock/bevy_cli --locked bevy_cli
173+
- name: Install Bevy CLI
174+
run: cargo install --git=https://github.com/TheBevyFlock/bevy_cli --locked bevy_cli
155175

156-
- name: Build for web
157-
run: |
158-
cd demo
159-
bevy build --locked --all-targets --yes -p bevy_yarnspinner_demo web
176+
- name: Build for web
177+
run: |
178+
cd demo
179+
bevy build --locked --all-targets --yes -p bevy_yarnspinner_demo web

0 commit comments

Comments
 (0)