Skip to content

Commit b65e511

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 23b1622 + 4a9e76c commit b65e511

File tree

146 files changed

+5078
-3348
lines changed

Some content is hidden

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

146 files changed

+5078
-3348
lines changed

.cargo/config.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ rustflags = [
5757
"-Wclippy::map_err_ignore",
5858
"-Wclippy::map_flatten",
5959
"-Wclippy::map_unwrap_or",
60-
"-Wclippy::match_on_vec_items",
6160
"-Wclippy::match_same_arms",
6261
"-Wclippy::match_wild_err_arm",
6362
"-Wclippy::match_wildcard_for_single_variants",

.github/workflows/ci.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,16 @@ jobs:
175175
test_success:
176176
runs-on: ubuntu-24.04
177177
needs: [test, compiletest, difftest, android]
178+
# Hack for buggy GitHub Actions behavior with skipped checks: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/troubleshooting-required-status-checks#handling-skipped-but-required-checks
179+
if: ${{ always() }}
178180
steps:
179-
- run: echo "All test jobs passed"
181+
# Another hack is to actually check the status of the dependencies or else it'll fall through
182+
- run: |
183+
echo "Checking statuses..."
184+
[[ "${{ needs.test.result }}" == "success" ]] || exit 1
185+
[[ "${{ needs.compiletest.result }}" == "success" ]] || exit 1
186+
[[ "${{ needs.difftest.result }}" == "success" ]] || exit 1
187+
[[ "${{ needs.android.result }}" == "success" ]] || exit 1
180188
181189
lint:
182190
name: Lint

0 commit comments

Comments
 (0)