sunset workspace-hack

MystenLabs · Feb 21, 2024 · 97528c6 · 97528c6
1 parent 5be0e98
commit 97528c6
Show file tree

Hide file tree

Showing 24 changed files with 7 additions and 3,428 deletions.
diff --git a/.config/hakari.toml b/.config/hakari.toml
diff --git a/.github/workflows/fastcrypto_pull.yml b/.github/workflows/fastcrypto_pull.yml
@@ -16,11 +16,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: bmwill/rust-cache@v1 # Fork of 'Swatinem/rust-cache' which allows caching additional paths
-      - name: Install cargo-hakari, and cache the binary
-        uses: baptiste0928/cargo-install@30f432979e99f3ea66a8fa2eede53c07063995d8
-        with:
-          crate: cargo-hakari
-          locked: true
       - name: Update the Narwhal pointer
         run: |
           scripts/update_fastcrypto.sh

diff --git a/.github/workflows/narwhal_pull.yml b/.github/workflows/narwhal_pull.yml
@@ -19,11 +19,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: bmwill/rust-cache@v1 # Fork of 'Swatinem/rust-cache' which allows caching additional paths
-      - name: Install cargo-hakari, and cache the binary
-        uses: baptiste0928/cargo-install@30f432979e99f3ea66a8fa2eede53c07063995d8
-        with:
-          crate: cargo-hakari
-          locked: true
       - name: Update the Narwhal pointer
         run: |
           scripts/update_narwhal.sh

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -39,37 +39,6 @@ jobs:
           command: build
           args: --all-targets --all-features --release --profile=release
 
-  # This job seems to be consistently producing false-positives, lets disable for now
-  # cargo-udeps:
-  #   runs-on: [ubuntu-ghcloud]
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     # Enable caching of the 'librocksdb-sys' crate by additionally caching the
-  #     # 'librocksdb-sys' src directory which is managed by cargo
-  #     - uses: bmwill/rust-cache@v1 # Fork of 'Swatinem/rust-cache' which allows caching additional paths
-  #       with:
-  #         path: ~/.cargo/registry/src/**/librocksdb-sys-*
-  #     - name: Install cargo-udeps, and cache the binary
-  #       uses: baptiste0928/cargo-install@v1
-  #       with:
-  #         crate: cargo-udeps
-  #         locked: true
-  #     - name: Install cargo-hakari, and cache the binary
-  #       uses: baptiste0928/cargo-install@v1
-  #       with:
-  #         crate: cargo-hakari
-  #         locked: true
-  #     # Normally running cargo-udeps requires use of a nightly compiler
-  #     # In order to have a more stable and less noisy experience, lets instead
-  #     # opt to use the stable toolchain specified via the 'rust-toolchain' file
-  #     # and instead enable nightly features via 'RUSTC_BOOTSTRAP'
-  #     - name: run cargo-udeps
-  #       run: |
-  #         # First we need to disable the workspace-hack package
-  #         cargo hakari disable
-  #         cargo hakari remove-deps -y
-  #         RUSTC_BOOTSTRAP=1 cargo udeps
-
   report-status:
     name: Report Status
     runs-on: ubuntu-latest

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -53,14 +53,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: bmwill/rust-cache@v1 # Fork of 'Swatinem/rust-cache' which allows caching additional paths
-      - name: Install cargo-hakari, and cache the binary
-        uses: baptiste0928/cargo-install@30f432979e99f3ea66a8fa2eede53c07063995d8
-        with:
-          crate: cargo-hakari
-          locked: true
       - run: cargo xlint
-      - run: |
-          cargo hakari generate --diff  # workspace-hack Cargo.toml is up-to-date
 
   release-notes-description-check:
     name: release-notes-check
@@ -155,11 +148,6 @@ jobs:
       - name: rustdoc
         run: |
           cargo doc --workspace --no-deps
-      - name: Install cargo-hakari, and cache the binary
-        uses: baptiste0928/cargo-install@30f432979e99f3ea66a8fa2eede53c07063995d8
-        with:
-          crate: cargo-hakari
-          locked: true
       - name: Install rustfmt
         run: rustup component add rustfmt
       - name: sui-execution
@@ -359,11 +347,6 @@ jobs:
     runs-on: [ubuntu-ghcloud]
     steps:
       - uses: actions/checkout@v3
-      - name: Install cargo-hakari, and cache the binary
-        uses: baptiste0928/cargo-install@30f432979e99f3ea66a8fa2eede53c07063995d8
-        with:
-          crate: cargo-hakari
-          locked: true
       - name: Make cut
         run: ./scripts/execution_layer.py cut for_ci_test
       - name: Check execution builds