Skip to content

Commit

Permalink
Merge pull request #1944 from DioxusLabs/jk/upgrade-axum-drop-others
Browse files Browse the repository at this point in the history
Upgrade to axum 0.7, consolidate deps, move out 3rd party adapters
  • Loading branch information
jkelleyrtp authored Feb 19, 2024
2 parents a454f2c + f9eabbe commit 3fef42a
Show file tree
Hide file tree
Showing 76 changed files with 1,243 additions and 4,409 deletions.
43 changes: 2 additions & 41 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
cache-all-crates: "true"
save-if: ${{ github.ref == 'refs/heads/master' }}
- uses: ilammy/setup-nasm@v1
- run: cargo check --all --examples --tests
- run: cargo check --all --examples --tests --all-features --all-targets

test:
if: github.event.pull_request.draft == false
Expand Down Expand Up @@ -110,45 +110,7 @@ jobs:
with:
cache-all-crates: "true"
save-if: ${{ github.ref == 'refs/heads/master' }}
- run: cargo clippy --workspace --examples --tests -- -D warnings

# We removed most unsafe that we can, and using nightly doubles our cache size
# miri:
# if: github.event.pull_request.draft == false
# name: Miri
# runs-on: ubuntu-latest
# env:
# CARGO_UNSTABLE_SPARSE_REGISTRY: 'true'
# RUSTFLAGS: -Dwarnings
# RUST_BACKTRACE: 1
# MIRIFLAGS: -Zmiri-tag-gc=1
# # Change to specific Rust release to pin
# rust_stable: stable
# rust_nightly: nightly-2023-11-16
# rust_clippy: 1.70.0

# steps:
# - uses: actions/checkout@v4
# - uses: ilammy/setup-nasm@v1
# - name: Install Rust ${{ env.rust_nightly }}
# uses: dtolnay/rust-toolchain@master
# with:
# toolchain: ${{ env.rust_nightly }}
# components: miri
# - uses: Swatinem/rust-cache@v2
# with:
# cache-all-crates: "true"
# save-if: ${{ github.ref == 'refs/heads/master' }}
# - name: miri
# # Many of tests in tokio/tests and doctests use #[tokio::test] or
# # #[tokio::main] that calls epoll_create1 that Miri does not support.
# # run: cargo miri test --features full --lib --no-fail-fast
# run: |
# cargo miri test --package dioxus-core -- --exact --nocapture
# cargo miri test --package dioxus-native-core --test miri_native -- --exact --nocapture
# env:
# MIRIFLAGS: -Zmiri-disable-isolation -Zmiri-strict-provenance -Zmiri-retag-fields
# PROPTEST_CASES: 10
- run: cargo clippy --workspace --examples --tests --all-features --all-targets -- -D warnings

playwright:
if: github.event.pull_request.draft == false
Expand Down Expand Up @@ -200,7 +162,6 @@ jobs:
path: playwright-report/
retention-days: 30


matrix_test:
runs-on: ${{ matrix.platform.os }}
if: github.event.pull_request.draft == false
Expand Down
4 changes: 3 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,7 @@
"editor.formatOnSave": false
},
"rust-analyzer.check.workspace": true,
"rust-analyzer.checkOnSave.allTargets": false,
"rust-analyzer.check.features": "all",
"rust-analyzer.cargo.features": "all",
"rust-analyzer.check.allTargets": true
}
Loading

0 comments on commit 3fef42a

Please sign in to comment.