Skip to content

Commit b26ef45

Browse files
pin CI to macos 14 until iOS example is updated and fix invalid_params tests (#20640)
# Objective - Bevy repo was just updated to macos-15 images by GitHub - This breaks building for iOS as the SDK we use is no longer available - Also closes #20629 ## Solution - Pin to macos-14 until we've updated iOS example --------- Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
1 parent 955e024 commit b26ef45

File tree

6 files changed

+23
-8
lines changed

6 files changed

+23
-8
lines changed

.github/workflows/example-run.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ env:
2020

2121
jobs:
2222
run-examples-macos-metal:
23-
runs-on: macos-latest
23+
runs-on: macos-14
2424
timeout-minutes: 30
2525
steps:
2626
- uses: actions/checkout@v4

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
branch: ${{ inputs.branch }}
5252
run: |
5353
# Create a new run with its associated metadata
54-
metadata='{"os":"${{ inputs.os }}", "commit": "${{ inputs.commit }}", "branch": "$branch"}'
54+
metadata='{"os":"${{ inputs.os }}", "commit": "${{ inputs.commit }}", "branch": "'$branch'"}'
5555
run=`curl https://pixel-eagle.com/$project/runs --json "$metadata" --oauth2-bearer ${{ secrets.PIXELEAGLE_TOKEN }} | jq '.id'`
5656
5757
SAVEIFS=$IFS

.github/workflows/update-caches.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
- os: ubuntu-latest
8282
toolchain: stable
8383
target: aarch64-linux-android
84-
- os: macos-latest
84+
- os: macos-14
8585
toolchain: stable
8686
target: aarch64-apple-ios-sim
8787

.github/workflows/validation-jobs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ env:
2626
jobs:
2727
build-and-install-on-iOS:
2828
if: ${{ github.event_name == 'merge_group' }}
29-
runs-on: macos-latest
29+
runs-on: macos-14
3030
timeout-minutes: 30
3131
steps:
3232
- uses: actions/checkout@v4

crates/bevy_ecs/src/system/system.rs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,15 @@ mod tests {
533533
let result = world.run_system_once(system);
534534

535535
assert!(matches!(result, Err(RunSystemError::Failed { .. })));
536-
let expected = "Parameter `Res<T>` failed validation: Resource does not exist\n";
537-
assert!(result.unwrap_err().to_string().contains(expected));
536+
537+
let expected = "Resource does not exist";
538+
let actual = result.unwrap_err().to_string();
539+
540+
assert!(
541+
actual.contains(expected),
542+
"Expected error message to contain `{}` but got `{}`",
543+
expected,
544+
actual
545+
);
538546
}
539547
}

crates/bevy_ecs/src/system/system_registry.rs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,8 +1005,15 @@ mod tests {
10051005
let result = world.run_system(id);
10061006

10071007
assert!(matches!(result, Err(RegisteredSystemError::Failed { .. })));
1008-
let expected = "System returned error: Parameter `Res<T>` failed validation: Resource does not exist\n";
1009-
assert!(result.unwrap_err().to_string().contains(expected));
1008+
let expected = "Resource does not exist";
1009+
let actual = result.unwrap_err().to_string();
1010+
1011+
assert!(
1012+
actual.contains(expected),
1013+
"Expected error message to contain `{}` but got `{}`",
1014+
expected,
1015+
actual
1016+
);
10101017
}
10111018

10121019
#[test]

0 commit comments

Comments
 (0)