Skip to content

Fix accidental reliance on a particular output of unstable sorting in a test #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 4, 2024
Merged

Fix accidental reliance on a particular output of unstable sorting in a test #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56cfdf0
Update to pdb-addr2line 0.11.1, which sorts symbols consistently.
mstange Oct 4, 2024
7ffc0a8
Revert #358 because the test should pass regardless of rust version now.
mstange Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Install Rust
#run: rustup target add ${{ matrix.target }}
run: rustup install 1.80 && rustup default 1.80 && rustup target add ${{ matrix.target }} && rustup component add clippy rustfmt
run: rustup target add ${{ matrix.target }}
- if: ${{ matrix.is_musl }}
name: Install musl-tools
run: sudo apt-get install -y musl-tools
Expand Down Expand Up @@ -78,9 +77,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Install Rust
# 1.81 causes issues when running the tests
#run: rustup update stable && rustup default stable && rustup target add ${{ matrix.target }}
run: rustup install 1.80 && rustup default 1.80 && rustup target add ${{ matrix.target }} && rustup component add clippy rustfmt
run: rustup update stable && rustup default stable && rustup target add ${{ matrix.target }}
- name: Install cross
# Latest cross release 0.2.5 fails to link binaries for the `aarch64-linux-android` target. A release is pending.
# Use a specific commit until the release is out. See https://github.com/cross-rs/cross/issues/1222
Expand All @@ -106,8 +103,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Install Rust
#run: rustup target add ${{ matrix.target }}
run: rustup install 1.80 && rustup default 1.80 && rustup target add ${{ matrix.target }} && rustup component add clippy rustfmt
run: rustup target add ${{ matrix.target }}
- name: Check
run: cargo check --workspace --verbose --target=${{ matrix.target }}
- name: Clippy
Expand Down
60 changes: 21 additions & 39 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading