Skip to content

Commit 80417ea

Browse files
PixelDust22PixelDust22
committed
Merge remote-tracking branch 'upstream/master'
# Conflicts: # Cargo.toml # crates/bevy_app/Cargo.toml
2 parents 78602f6 + 4825051 commit 80417ea

File tree

467 files changed

+27280
-14770
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

467 files changed

+27280
-14770
lines changed

‎.cargo/config_fast_builds

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ rustflags = ["-Clink-arg=-fuse-ld=lld", "-Zshare-generics=y"]
1010
# NOTE: you must manually install https://github.com/michaeleisel/zld on mac. you can easily do this with the "brew" package manager:
1111
# `brew install michaeleisel/zld/zld`
1212
[target.x86_64-apple-darwin]
13-
rustflags = ["-C", "link-arg=-fuse-ld=/usr/local/bin/zld", "-Zshare-generics=y"]
13+
rustflags = ["-C", "link-arg=-fuse-ld=/usr/local/bin/zld", "-Zshare-generics=y", "-Zrun-dsymutil=no"]
1414

1515
[target.x86_64-pc-windows-msvc]
1616
linker = "rust-lld.exe"

‎.github/ISSUE_TEMPLATE/bug_report.md

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
name: Bug Report
3+
about: Report a bug to help us improve!
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
---
8+
9+
**Bevy version**
10+
11+
The release number or commit hash of the version you're using.
12+
13+
**Operating system & version**
14+
15+
Ex: Windows 10, Ubuntu 18.04, iOS 14.
16+
17+
**What you did**
18+
19+
The steps you took to uncover this bug. Please list full reproduction steps if
20+
feasible.
21+
22+
**What you expected to happen**
23+
24+
What you think should've happened if everything was working properly.
25+
26+
**What actually happened**
27+
28+
The actual result of the actions you described.
29+
30+
**Additional information**
31+
32+
Any additional information you would like to add such as screenshots, logs, etc.

‎.github/ISSUE_TEMPLATE/feature_request.md

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
name: Feature Request
3+
about: Propose a new feature!
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
---
8+
9+
**What problem does this solve or what need does it fill?**
10+
11+
A description of why this particular feature should be added.
12+
13+
**Describe the solution would you like?**
14+
15+
The solution you propose for the problem presented.
16+
17+
**Describe the alternative(s) you've considered?**
18+
19+
Other solutions to solve and/or work around the problem presented.
20+
21+
**Additional context**
22+
23+
Any other information you would like to add such as related previous work,
24+
screenshots, benchmarks, etc.

‎.github/dependabot.yml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: cargo
4+
directory: /
5+
schedule:
6+
interval: weekly
7+
8+
- package-ecosystem: github-actions
9+
directory: /
10+
schedule:
11+
interval: weekly

‎.github/workflows/ci.yml

+48-12
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ jobs:
1818
exclude:
1919
- os: macos-10.15
2020
toolchain: nightly
21+
- os: windows-2019
22+
toolchain: nightly
2123
runs-on: ${{ matrix.os }}
2224
needs: clean
2325
steps:
@@ -55,32 +57,66 @@ jobs:
5557
CARGO_INCREMENTAL: 0
5658
RUSTFLAGS: "-C debuginfo=0 -D warnings"
5759

60+
build-wasm:
61+
strategy:
62+
matrix:
63+
toolchain: [stable, nightly]
64+
os: [ubuntu-20.04]
65+
runs-on: ${{ matrix.os }}
66+
needs: clean
67+
steps:
68+
- uses: actions/checkout@v2
69+
70+
- uses: actions-rs/toolchain@v1
71+
with:
72+
toolchain: ${{ matrix.toolchain }}
73+
target: wasm32-unknown-unknown
74+
override: true
75+
76+
- uses: actions/cache@v2
77+
with:
78+
path: |
79+
target
80+
key: ${{ runner.os }}-cargo-check-test-${{ matrix.toolchain }}-${{ hashFiles('**/Cargo.lock') }}
81+
82+
- name: Check wasm
83+
uses: actions-rs/cargo@v1
84+
with:
85+
command: check
86+
args: --target wasm32-unknown-unknown --no-default-features --features bevy_winit,x11,hdr,bevy_gltf
87+
88+
build-android:
89+
runs-on: ubuntu-latest
90+
steps:
91+
- uses: actions/checkout@v2
92+
- name: Install Android targets
93+
run: rustup target add aarch64-linux-android armv7-linux-androideabi
94+
- name: Install Cargo APK
95+
run: cargo install cargo-apk
96+
- name: Build APK
97+
run: cargo apk build --example android
98+
5899
clean:
59100
runs-on: ubuntu-latest
60101
steps:
61102
- uses: actions/checkout@v2
62103

63104
- uses: actions-rs/toolchain@v1
64105
with:
65-
toolchain: nightly
106+
toolchain: nightly-2020-12-07
66107
components: rustfmt, clippy
67108
override: true
68-
109+
69110
- name: Install alsa
70-
run: sudo apt-get install --no-install-recommends libasound2-dev
111+
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev
71112

72113
- name: Install udev
73-
run: sudo apt-get install --no-install-recommends libudev-dev
114+
run: sudo apt-get update; sudo apt-get install --no-install-recommends libudev-dev
74115

75116
- name: Check the format
76-
run: cargo +nightly fmt --all -- --check
117+
run: cargo +nightly-2020-12-07 fmt --all -- --check
77118

78119
# type complexity must be ignored because we use huge templates for queries
120+
# -A clippy::manual-strip: strip_prefix support was added in 1.45. we want to support earlier rust versions
79121
- name: Run clippy
80-
run: >
81-
cargo +nightly clippy
82-
--all-targets
83-
--all-features
84-
--
85-
-D warnings
86-
-A clippy::type_complexity
122+
run: cargo clippy --all-targets --all-features -- -D warnings -A clippy::type_complexity -A clippy::manual-strip

‎.github/workflows/ios.yml

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: iOS cron CI
2+
3+
on:
4+
schedule:
5+
- cron: '0 0 * * *'
6+
7+
env:
8+
CARGO_TERM_COLOR: always
9+
10+
jobs:
11+
build:
12+
runs-on: macOS-latest
13+
steps:
14+
- uses: actions/checkout@v2
15+
16+
- uses: actions-rs/toolchain@v1
17+
with:
18+
toolchain: stable
19+
override: true
20+
21+
- uses: actions/cache@v2
22+
with:
23+
path: |
24+
target
25+
key: ${{ runner.os }}-cargo-check-test-${{ matrix.toolchain }}-${{ hashFiles('**/Cargo.lock') }}
26+
27+
- uses: actions-rs/install@v0.1
28+
with:
29+
crate: cargo-lipo
30+
version: latest
31+
32+
- name: Add iOS targets
33+
run: rustup target add aarch64-apple-ios x86_64-apple-ios
34+
35+
- name: Build and install iOS app in iOS Simulator.
36+
run: cd examples/ios && make install

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ crates/*/target
33
**/*.rs.bk
44
Cargo.lock
55
.cargo/config
6+
.cargo/config.toml
67
/.idea
78
/.vscode
8-
/benches/target
9+
/benches/target

0 commit comments

Comments
 (0)