Skip to content
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.

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

[Rust] use toml format for toolchain file #11873

Merged
merged 2 commits into from
May 10, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Remove unnecessary actions-rs/toolchain
  • Loading branch information
mwtian committed May 10, 2023
commit b45998a3fd4e232d93404fdef7a863db80291677
1 change: 0 additions & 1 deletion .github/actions/ts-e2e/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ runs:
- uses: actions/checkout@7dd9e2a3dc350cf687eb1b2a4fadfee8c8e49675 # pin@v3
with:
ref: ${{ inputs.ref }}
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # pin@v1
# Disabled for now as it makes test runs take longer
# - uses: bmwill/rust-cache@v1 # Fork of 'Swatinem/rust-cache' which allows caching additional paths
- uses: pnpm/action-setup@c3b53f6a16e57305370b4ae5a540c2077a1d50dd # pin@v2.2.4
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ jobs:
runs-on: [ubuntu-ghcloud]
steps:
- uses: actions/checkout@7dd9e2a3dc350cf687eb1b2a4fadfee8c8e49675 # pin@v3
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # pin@v1
# Turn off the caching on self-hosted jobs
# Enable caching of the 'librocksdb-sys' crate by additionally caching the
# 'librocksdb-sys' src directory which is managed by cargo
Expand Down Expand Up @@ -165,7 +164,6 @@ jobs:
- 5432:5432
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1

- name: Run indexer benchmark
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # pin@v2

- name: Install Rust toolchain
uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # pin@v1
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ jobs:
fail-fast: true
steps:
- uses: actions/checkout@7dd9e2a3dc350cf687eb1b2a4fadfee8c8e49675 # pin@v3
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # pin@v1
with:
components: llvm-tools-preview
- run: rustup component add llvm-tools-preview
# Enable caching of the 'librocksdb-sys' crate by additionally caching the
# 'librocksdb-sys' src directory which is managed by cargo
- name: Install grcov, and cache the binary
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ jobs:
with:
ref: ${{ github.head_ref }}
token: ${{ secrets.AUTOMERGE_TOKEN }}
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # pin@v1
- name: Install cargo-hakari, and cache the binary
uses: baptiste0928/cargo-install@48c92f3d491efa23daace9891498a14c5aaa1afd # pin@v2
with:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ jobs:
runs-on: ubuntu-ghcloud
steps:
- uses: actions/checkout@7dd9e2a3dc350cf687eb1b2a4fadfee8c8e49675 # pin@v3
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # pin@v1
# Disabled for now as it makes test runs take longer
# - uses: bmwill/rust-cache@v1 # Fork of 'Swatinem/rust-cache' which allows caching additional paths
- uses: pnpm/action-setup@c3b53f6a16e57305370b4ae5a540c2077a1d50dd # pin@v2.2.4
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/fastcrypto_pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ jobs:
fail-fast: true
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
- 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@48c92f3d491efa23daace9891498a14c5aaa1afd
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/narwhal_pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ jobs:
fail-fast: true
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
- 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@48c92f3d491efa23daace9891498a14c5aaa1afd
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/nightly-narwhal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ jobs:
runs-on: ubuntu-ghcloud
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
- uses: taiki-e/install-action@nextest
- name: Set Swap Space
uses: pierotofy/set-swap-space@master
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ jobs:
runs-on: [ubuntu-ghcloud]
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
- name: cargo build
uses: actions-rs/cargo@v1
with:
Expand All @@ -45,7 +44,6 @@ jobs:
# runs-on: [ubuntu-ghcloud]
# steps:
# - uses: actions/checkout@v3
# - uses: actions-rs/toolchain@v1
# # 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
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ jobs:
- uses: actions/checkout@v3
with:
ref: ${{ inputs.sui_tag }}
- uses: actions-rs/toolchain@v1

- name: cargo build (release)
id: build
Expand Down
16 changes: 2 additions & 14 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ jobs:
runs-on: [ubuntu-latest]
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
- 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@48c92f3d491efa23daace9891498a14c5aaa1afd
Expand Down Expand Up @@ -80,7 +79,6 @@ jobs:
fail-fast: false
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
- uses: taiki-e/install-action@nextest
- name: Set Swap Space
uses: pierotofy/set-swap-space@master
Expand Down Expand Up @@ -122,7 +120,6 @@ jobs:
fail-fast: false
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
- uses: taiki-e/install-action@nextest
- uses: arduino/setup-protoc@v1
# this avoids rate-limiting
Expand Down Expand Up @@ -151,7 +148,6 @@ jobs:
MSIM_WATCHDOG_TIMEOUT_MS: 60000
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
- uses: taiki-e/install-action@nextest
- name: Set Swap Space
uses: pierotofy/set-swap-space@master
Expand All @@ -171,7 +167,6 @@ jobs:
runs-on: [ubuntu-ghcloud]
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1

- name: Setup environment
run: .github/scripts/rosetta/setup.sh
Expand Down Expand Up @@ -228,10 +223,7 @@ jobs:
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
components: clippy

- run: rustup component add clippy
# TODO(bradh): debug and re-enable this; the caching is breaking the clippy build
# Enable caching of the 'librocksdb-sys' crate by additionally caching the
# 'librocksdb-sys' src directory which is managed by cargo
Expand All @@ -249,9 +241,7 @@ jobs:
runs-on: [ubuntu-latest]
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
components: rustfmt
- run: rustup component add rustfmt
- name: rustfmt
uses: actions-rs/cargo@v1
with:
Expand All @@ -276,7 +266,6 @@ jobs:

steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1

- name: Prover Setup
run: |
Expand Down Expand Up @@ -319,7 +308,6 @@ jobs:
# - 5432:5432
# steps:
# - uses: actions/checkout@v3
# - uses: actions-rs/toolchain@v1
# - name: integration-test-with-postgres
# #We only have 1 instance of postgres DB, can only run test in single thread
# run: |
Expand Down
4 changes: 1 addition & 3 deletions narwhal/.github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ jobs:
fail-fast: true
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
components: llvm-tools-preview
- run: rustup component add llvm-tools-preview
# 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
Expand Down
1 change: 0 additions & 1 deletion narwhal/.github/workflows/dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ jobs:
with:
ref: ${{ github.head_ref }}
token: ${{ secrets.AUTOMERGE_TOKEN }}
- uses: actions-rs/toolchain@v1
- name: Install cargo-hakari, and cache the binary
uses: baptiste0928/cargo-install@v1
with:
Expand Down
3 changes: 0 additions & 3 deletions narwhal/.github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ jobs:
runs-on: ubuntu-ghcloud
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
- uses: taiki-e/install-action@nextest
# Enable caching of the 'librocksdb-sys' crate by additionally caching the
# 'librocksdb-sys' src directory which is managed by cargo
Expand Down Expand Up @@ -76,7 +75,6 @@ jobs:
runs-on: ubuntu-ghcloud
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
- name: cargo build
uses: actions-rs/cargo@v1
with:
Expand All @@ -87,7 +85,6 @@ jobs:
runs-on: ubuntu-ghcloud
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
# 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
Expand Down
10 changes: 2 additions & 8 deletions narwhal/.github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
- 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@v1
Expand All @@ -61,7 +60,6 @@ jobs:
RUSTFLAGS: -D warnings
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
- uses: taiki-e/install-action@nextest
# Enable caching of the 'librocksdb-sys' crate by additionally caching the
# 'librocksdb-sys' src directory which is managed by cargo
Expand All @@ -81,9 +79,7 @@ jobs:
runs-on: ubuntu-ghcloud
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
components: clippy
- run: rustup component add clippy
# 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
Expand All @@ -97,9 +93,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
components: rustfmt
- run: rustup component add rustfmt
- name: rustfmt
uses: actions-rs/cargo@v1
with:
Expand Down