Merge pull request #2572 from serde-rs/cargorm

Adopt `cargo rm` after Cargo bugfix
serde-rs · Aug 14, 2023 · 7b548db · 7b548db
2 parents 5e56c9f + d39dea8
commit 7b548db
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -122,13 +122,11 @@ jobs:
       - run: precompiled/build.sh
       - name: replace serde_derive dependency with precompiled
         run: |
-          # FIXME: consider using `cargo rm serde_derive` but it's currently broken
-          # https://github.com/rust-lang/cargo/issues/12419
-          sed -i '/serde_derive =/d' serde/Cargo.toml
-          sed -i '/derive = \["serde_derive"\]/d' serde/Cargo.toml
+          cargo rm serde_derive --package serde
+          cargo rm serde_derive --package serde --dev
           sed -i '/"serde_derive"/d' Cargo.toml
           sed -i '/\[workspace\]/d' precompiled/serde_derive/Cargo.toml
-          cargo add --dev serde_derive --path precompiled/serde_derive --manifest-path test_suite/Cargo.toml
+          cargo add --dev serde_derive --path precompiled/serde_derive --package serde_test_suite
           git diff
       - run: cd test_suite && cargo test --features unstable -- --skip ui --exact