Skip to content

Commit 45f82f9

Browse files
committed
Merge branch 'main' into schedule-build-pass
2 parents a0ce1fe + 8f32c79 commit 45f82f9

File tree

665 files changed

+15831
-10487
lines changed

Some content is hidden

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

665 files changed

+15831
-10487
lines changed

.github/ISSUE_TEMPLATE/docs_improvement.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ assignees: ''
1010

1111
Provide a link to the documentation and describe how it could be improved. In what ways is it incomplete, incorrect, or misleading?
1212

13-
If you have suggestions on exactly what the new docs should say, feel free to include them here. Alternatively, make the changes yourself and [create a pull request](https://bevyengine.org/learn/book/contributing/code/) instead.
13+
If you have suggestions on exactly what the new docs should say, feel free to include them here. Alternatively, make the changes yourself and [create a pull request](https://bevyengine.org/learn/contribute/helping-out/writing-docs/) instead.

.github/workflows/ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ env:
1212
CARGO_TERM_COLOR: always
1313
# If nightly is breaking CI, modify this variable to target a specific nightly version.
1414
NIGHTLY_TOOLCHAIN: nightly
15+
RUSTFLAGS: "-D warnings"
1516

1617
concurrency:
1718
group: ${{github.workflow}}-${{github.ref}}
@@ -170,8 +171,6 @@ jobs:
170171
with:
171172
target: wasm32-unknown-unknown
172173
- name: Check wasm
173-
env:
174-
RUSTFLAGS: "-D warnings"
175174
run: cargo check --target wasm32-unknown-unknown
176175

177176
build-wasm-atomics:
@@ -243,7 +242,7 @@ jobs:
243242
steps:
244243
- uses: actions/checkout@v4
245244
- name: Check for typos
246-
uses: crate-ci/typos@v1.28.4
245+
uses: crate-ci/typos@v1.29.4
247246
- name: Typos info
248247
if: failure()
249248
run: |

.github/workflows/daily.yml

Lines changed: 0 additions & 147 deletions
This file was deleted.

.github/workflows/post-release.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ env:
88
CARGO_TERM_COLOR: always
99

1010
jobs:
11-
ci:
11+
bump:
1212
if: github.repository == 'bevyengine/bevy'
1313
runs-on: ubuntu-latest
14+
permissions:
15+
contents: write
16+
pull-requests: write
1417
steps:
1518
- uses: actions/checkout@v4
1619

.github/workflows/release.yml

Lines changed: 0 additions & 55 deletions
This file was deleted.

.github/workflows/send-screenshots-to-pixeleagle.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ jobs:
3434
if: ${{ ! fromJSON(env.PIXELEAGLE_TOKEN_EXISTS) }}
3535
run: |
3636
echo "The PIXELEAGLE_TOKEN secret does not exist, so uploading screenshots to Pixel Eagle was skipped." >> $GITHUB_STEP_SUMMARY
37-
37+
3838
- name: Download artifact
3939
if: ${{ fromJSON(env.PIXELEAGLE_TOKEN_EXISTS) }}
4040
uses: actions/download-artifact@v4
4141
with:
4242
pattern: ${{ inputs.artifact }}
43-
43+
4444
- name: Send to Pixel Eagle
4545
if: ${{ fromJSON(env.PIXELEAGLE_TOKEN_EXISTS) }}
4646
env:
@@ -49,11 +49,11 @@ jobs:
4949
# Create a new run with its associated metadata
5050
metadata='{"os":"${{ inputs.os }}", "commit": "${{ inputs.commit }}", "branch": "${{ inputs.branch }}"}'
5151
run=`curl https://pixel-eagle.vleue.com/$project/runs --json "$metadata" --oauth2-bearer ${{ secrets.PIXELEAGLE_TOKEN }} | jq '.id'`
52-
52+
5353
SAVEIFS=$IFS
54-
54+
5555
cd ${{ inputs.artifact }}
56-
56+
5757
# Read the hashes of the screenshot for fast comparison when they are equal
5858
IFS=$'\n'
5959
# Build a json array of screenshots and their hashes
@@ -67,7 +67,7 @@ jobs:
6767
done
6868
hashes=`echo $hashes | rev | cut -c 2- | rev`
6969
hashes="$hashes]"
70-
70+
7171
IFS=$SAVEIFS
7272
7373
# Upload screenshots with unknown hashes
@@ -78,7 +78,7 @@ jobs:
7878
curl https://pixel-eagle.vleue.com/$project/runs/$run/screenshots -F "data=@./screenshots-$name" -F "screenshot=$name" --oauth2-bearer ${{ secrets.PIXELEAGLE_TOKEN }}
7979
echo
8080
done
81-
81+
8282
IFS=$SAVEIFS
8383
8484
cd ..
@@ -93,17 +93,17 @@ jobs:
9393
missing=`cat pixeleagle.json | jq '.missing | length'`
9494
if [ ! $missing -eq 0 ]; then
9595
echo "There are $missing missing screenshots"
96-
echo "::warning title=$missing missing screenshots on ${{ inputs.os }}::https://pixel-eagle.vleue.com/$project/runs/$run/compare/$compared_with"
96+
echo "::warning title=$missing missing screenshots on ${{ inputs.os }}::https://pixel-eagle.com/project/$project/run/$run/compare/$compared_with"
9797
status=1
9898
fi
9999
100100
diff=`cat pixeleagle.json | jq '.diff | length'`
101101
if [ ! $diff -eq 0 ]; then
102102
echo "There are $diff screenshots with a difference"
103-
echo "::warning title=$diff different screenshots on ${{ inputs.os }}::https://pixel-eagle.vleue.com/$project/runs/$run/compare/$compared_with"
103+
echo "::warning title=$diff different screenshots on ${{ inputs.os }}::https://pixel-eagle.com/project/$project/run/$run/compare/$compared_with"
104104
status=1
105105
fi
106106
107-
echo "created run $run: https://pixel-eagle.vleue.com/$project/runs/$run/compare/$compared_with"
107+
echo "created run $run: https://pixel-eagle.com/project/$project/run/$run/compare/$compared_with"
108108
109109
exit $status

0 commit comments

Comments
 (0)