Skip to content

Commit 9aad6ca

Browse files
committed
Merge remote-tracking branch 'cart/next-gen-scenes' into bsn-reconcile
2 parents e2933bb + 05b79c2 commit 9aad6ca

File tree

535 files changed

+7266
-8650
lines changed

Some content is hidden

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

535 files changed

+7266
-8650
lines changed

.github/actions/install-linux-deps/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ inputs:
2828
wayland:
2929
description: Install Wayland (libwayland-dev)
3030
required: false
31-
default: "false"
31+
default: "true"
3232
xkb:
3333
description: Install xkb (libxkbcommon-dev)
3434
required: false

.github/workflows/ci.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: CI
22

3+
permissions:
4+
contents: read
5+
36
on:
47
merge_group:
58
pull_request:
@@ -257,9 +260,12 @@ jobs:
257260
with:
258261
target: wasm32-unknown-unknown
259262
- name: Check wasm
263+
env:
264+
RUSTFLAGS: --cfg getrandom_backend="wasm_js"
260265
run: cargo check --target wasm32-unknown-unknown
261266

262267
build-wasm-atomics:
268+
if: ${{ false }} # Disabled temporarily due to https://github.com/rust-lang/rust/issues/145101
263269
runs-on: ubuntu-latest
264270
timeout-minutes: 30
265271
needs: build
@@ -287,7 +293,7 @@ jobs:
287293
- name: Check wasm
288294
run: cargo check --target wasm32-unknown-unknown -Z build-std=std,panic_abort
289295
env:
290-
RUSTFLAGS: "-C target-feature=+atomics,+bulk-memory"
296+
RUSTFLAGS: '-C target-feature=+atomics,+bulk-memory --cfg getrandom_backend="wasm_js"'
291297

292298
markdownlint:
293299
runs-on: ubuntu-latest

.github/workflows/dependencies.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
name: Dependencies
22

3+
permissions:
4+
contents: read
5+
36
on:
47
pull_request:
58
paths:
6-
- '**/Cargo.toml'
7-
- 'deny.toml'
9+
- "**/Cargo.toml"
10+
- "deny.toml"
811
push:
912
paths:
10-
- '**/Cargo.toml'
11-
- 'deny.toml'
13+
- "**/Cargo.toml"
14+
- "deny.toml"
1215
branches:
1316
- main
1417

.github/workflows/example-run-report.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ name: Example Run - PR Comments
66
# Also requesting write permissions on PR to be able to comment
77
permissions:
88
pull-requests: "write"
9+
contents: "read"
910

1011
on:
1112
workflow_run:
@@ -59,8 +60,10 @@ jobs:
5960
path: screenshots
6061
- name: branch name
6162
id: branch-name
63+
env:
64+
BRANCH_NAME: ${{ github.event.workflow_run.head_branch }}
6265
run: |
63-
echo "result=PR-$(cat PR)-${{ github.event.workflow_run.head_branch }}" >> $GITHUB_OUTPUT
66+
echo "result=PR-$(cat PR)-$BRANCH_NAME" >> $GITHUB_OUTPUT
6467
- name: PR number
6568
id: pr-number
6669
run: |

.github/workflows/example-run.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: Example Run
22

3+
permissions:
4+
contents: read
5+
36
on:
47
merge_group:
58
pull_request:

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: Send Screenshots to Pixel Eagle
22

3+
permissions:
4+
contents: read
5+
36
on:
47
workflow_call:
58
inputs:
@@ -45,9 +48,10 @@ jobs:
4548
if: ${{ fromJSON(env.PIXELEAGLE_TOKEN_EXISTS) }}
4649
env:
4750
project: B04F67C0-C054-4A6F-92EC-F599FEC2FD1D
51+
branch: ${{ inputs.branch }}
4852
run: |
4953
# Create a new run with its associated metadata
50-
metadata='{"os":"${{ inputs.os }}", "commit": "${{ inputs.commit }}", "branch": "${{ inputs.branch }}"}'
54+
metadata='{"os":"${{ inputs.os }}", "commit": "${{ inputs.commit }}", "branch": "$branch"}'
5155
run=`curl https://pixel-eagle.com/$project/runs --json "$metadata" --oauth2-bearer ${{ secrets.PIXELEAGLE_TOKEN }} | jq '.id'`
5256
5357
SAVEIFS=$IFS

.github/workflows/update-caches.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: Update Actions Caches
22

3+
permissions:
4+
contents: read
5+
36
on:
47
# Manually
58
workflow_dispatch:

.github/workflows/validation-jobs.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: validation jobs
22

3+
permissions:
4+
contents: read
5+
36
on:
47
merge_group:
58
pull_request:
@@ -130,6 +133,8 @@ jobs:
130133
cd ../..
131134
132135
- name: First Wasm build
136+
env:
137+
RUSTFLAGS: --cfg getrandom_backend="wasm_js"
133138
run: |
134139
cargo build --release --example testbed_ui --target wasm32-unknown-unknown
135140

.github/workflows/weekly.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
name: Weekly beta compile test
22

3+
permissions:
4+
contents: read
5+
36
on:
47
schedule:
58
# New versions of rust release on Thursdays. We test on Mondays to get at least 3 days of warning before all our CI breaks again.
69
# https://forge.rust-lang.org/release/process.html#release-day-thursday
7-
- cron: '0 12 * * 1'
10+
- cron: "0 12 * * 1"
811
workflow_dispatch:
912

1013
env:
@@ -85,7 +88,7 @@ jobs:
8588

8689
close-any-open-issues:
8790
runs-on: ubuntu-latest
88-
needs: ['test', 'lint', 'check-compiles']
91+
needs: ["test", "lint", "check-compiles"]
8992
permissions:
9093
issues: write
9194
steps:
@@ -106,14 +109,13 @@ jobs:
106109
COMMENT: |
107110
[Last pipeline run](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) successfully completed. Closing issue.
108111
109-
110112
open-issue:
111113
name: Warn that weekly CI fails
112114
runs-on: ubuntu-latest
113115
needs: [test, lint, check-compiles]
114116
permissions:
115117
issues: write
116-
# We disable this job on forks, because
118+
# We disable this job on forks, because
117119
# Use always() so the job doesn't get canceled if any other jobs fail
118120
if: ${{ github.repository == 'bevyengine/bevy' && always() && contains(needs.*.result, 'failure') }}
119121
steps:

0 commit comments

Comments
 (0)