Skip to content

Commit

Permalink
Merge branch 'trunk' into device-timeouts
Browse files Browse the repository at this point in the history
  • Loading branch information
cwfitzgerald committed Jan 31, 2024
2 parents e40d3aa + d7bbaba commit 785c721
Show file tree
Hide file tree
Showing 134 changed files with 3,396 additions and 2,409 deletions.
3 changes: 3 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@ xtask = "run --manifest-path xtask/Cargo.toml"
rustflags = [
"--cfg=web_sys_unstable_apis"
]
rustdocflags = [
"--cfg=web_sys_unstable_apis"
]
3 changes: 2 additions & 1 deletion .deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ skip-tree = [
{ name = "rustc_version", version = "0.2.3" },
]
skip = [
{ name = "hlsl-snapshots", version = "0.1.0" },
]
wildcards = "deny"
allow-wildcard-paths = true

[licenses]
allow = [
Expand All @@ -26,7 +28,6 @@ allow = [
[sources]
allow-git = [
# Waiting on releases; used in examples only
"https://github.com/SiegeEngine/ddsfile",
"https://github.com/Razaekel/noise-rs",

"https://github.com/grovesNL/glow",
Expand Down
16 changes: 9 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ env:
RUST_BACKTRACE: full
PKG_CONFIG_ALLOW_CROSS: 1 # allow android to work
RUSTFLAGS: --cfg=web_sys_unstable_apis -D warnings
RUSTDOCFLAGS: -Dwarnings
RUSTDOCFLAGS: --cfg=web_sys_unstable_apis -D warnings
WASM_BINDGEN_TEST_TIMEOUT: 300 # 5 minutes
CACHE_SUFFIX: c # cache busting

Expand All @@ -76,7 +76,9 @@ env:
jobs:
check:
# runtime is normally 2-8 minutes
timeout-minutes: 15
#
# currently high due to documentation time problems on mac.
timeout-minutes: 30

strategy:
fail-fast: false
Expand All @@ -90,18 +92,18 @@ jobs:

# MacOS
- name: MacOS x86_64
os: macos-12
os: macos-14
target: x86_64-apple-darwin
kind: native

- name: MacOS aarch64
os: macos-12
os: macos-14
target: aarch64-apple-darwin
kind: native

# IOS
- name: IOS aarch64
os: macos-12
os: macos-14
target: aarch64-apple-ios
kind: native

Expand Down Expand Up @@ -247,7 +249,7 @@ jobs:

# MacOS
- name: MacOS x86_64
os: macos-12
os: macos-14
target: x86_64-apple-darwin

# Linux
Expand Down Expand Up @@ -380,7 +382,7 @@ jobs:

# Mac
- name: Mac aarch64
os: macos-13-xlarge
os: macos-14

# Linux
- name: Linux x86_64
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/shaders.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
naga-validate-macos:
name: "Validate: MSL"
runs-on: macos-latest
runs-on: macos-14
steps:
- uses: actions/checkout@v4

Expand Down
380 changes: 254 additions & 126 deletions CHANGELOG.md

Large diffs are not rendered by default.

Loading

0 comments on commit 785c721

Please sign in to comment.