Skip to content

Commit ff4bf15

Browse files
committed
chore: configure stable rustfmt
1 parent fc056ff commit ff4bf15

File tree

3 files changed

+11
-58
lines changed

3 files changed

+11
-58
lines changed

.github/workflows/ci-pre-commit.yml

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -19,39 +19,11 @@ jobs:
1919
fetch-depth: 0
2020
- uses: actions-rs/toolchain@v1
2121
with:
22-
profile: minimal
23-
toolchain: nightly-2023-03-01
24-
components: rustfmt, clippy
25-
- uses: actions-rs/toolchain@v1
26-
with:
27-
profile: minimal
28-
toolchain: nightly-2023-07-23
29-
components: rustfmt, clippy
30-
- uses: actions-rs/toolchain@v1
31-
with:
32-
profile: minimal
33-
toolchain: nightly-2024-03-26
34-
components: rustfmt, clippy
35-
- uses: actions-rs/toolchain@v1
36-
with:
37-
profile: minimal
38-
toolchain: nightly-2024-08-04
39-
components: rustfmt, clippy
40-
- uses: actions-rs/toolchain@v1
41-
with:
42-
profile: minimal
43-
toolchain: 1.66.1
44-
components: rustfmt, clippy
45-
- uses: actions-rs/toolchain@v1
46-
with:
47-
profile: minimal
48-
toolchain: 1.73.0
49-
components: rustfmt, clippy
50-
- uses: actions-rs/toolchain@v1
51-
with:
52-
profile: minimal
5322
toolchain: 1.82.0
54-
components: rustfmt, clippy
23+
- name: Install Rust versions
24+
run: |
25+
rustup install 1.66.1
26+
rustup install 1.73.0
5527
- name: Install protoc
5628
uses: arduino/setup-protoc@v3
5729
- uses: actions/checkout@v4

.pre-commit-config.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ repos:
3939
- id: cargo-fmt-remote-executor
4040
name: Cargo format for remote executor
4141
language: "rust"
42-
entry: cargo +nightly-2023-03-01 fmt --manifest-path ./governance/remote_executor/Cargo.toml --all -- --config-path rustfmt.toml
42+
entry: cargo +1.66.1 fmt --manifest-path ./governance/remote_executor/Cargo.toml --all
4343
pass_filenames: false
4444
files: governance/remote_executor
4545
- id: cargo-clippy-remote-executor
@@ -52,7 +52,7 @@ repos:
5252
- id: cargo-fmt-cosmwasm
5353
name: Cargo format for cosmwasm contract
5454
language: "rust"
55-
entry: cargo +nightly-2023-03-01 fmt --manifest-path ./target_chains/cosmwasm/Cargo.toml --all -- --config-path rustfmt.toml
55+
entry: cargo +1.82.0 fmt --manifest-path ./target_chains/cosmwasm/Cargo.toml --all
5656
pass_filenames: false
5757
files: target_chains/cosmwasm
5858
- id: cargo-clippy-cosmwasm
@@ -65,7 +65,7 @@ repos:
6565
- id: cargo-fmt-hermes
6666
name: Cargo format for Hermes
6767
language: "rust"
68-
entry: cargo +nightly-2024-03-26 fmt --manifest-path ./apps/hermes/server/Cargo.toml --all -- --config-path rustfmt.toml
68+
entry: cargo +1.82.0 fmt --manifest-path ./apps/hermes/server/Cargo.toml --all
6969
pass_filenames: false
7070
files: apps/hermes
7171
- id: cargo-clippy-hermes
@@ -78,7 +78,7 @@ repos:
7878
- id: cargo-fmt-fortuna
7979
name: Cargo format for Fortuna
8080
language: "rust"
81-
entry: cargo +nightly-2023-07-23 fmt --manifest-path ./apps/fortuna/Cargo.toml --all -- --config-path rustfmt.toml
81+
entry: cargo +1.82.0 fmt --manifest-path ./apps/fortuna/Cargo.toml --all
8282
pass_filenames: false
8383
files: apps/fortuna
8484
- id: cargo-clippy-fortuna
@@ -91,7 +91,7 @@ repos:
9191
- id: cargo-fmt-message-buffer
9292
name: Cargo format for message buffer contract
9393
language: "rust"
94-
entry: cargo +nightly-2023-03-01 fmt --manifest-path ./pythnet/message_buffer/Cargo.toml --all -- --config-path rustfmt.toml
94+
entry: cargo +1.66.1 fmt --manifest-path ./pythnet/message_buffer/Cargo.toml --all
9595
pass_filenames: false
9696
files: pythnet/message_buffer
9797
- id: cargo-clippy-message-buffer
@@ -104,7 +104,7 @@ repos:
104104
- id: cargo-fmt-pythnet-sdk
105105
name: Cargo format for pythnet SDK
106106
language: "rust"
107-
entry: cargo +nightly-2024-08-04 fmt --manifest-path ./pythnet/pythnet_sdk/Cargo.toml --all -- --config-path rustfmt.toml
107+
entry: cargo +1.82.0 fmt --manifest-path ./pythnet/pythnet_sdk/Cargo.toml --all
108108
pass_filenames: false
109109
files: pythnet/pythnet_sdk
110110
- id: cargo-clippy-pythnet-sdk
@@ -117,7 +117,7 @@ repos:
117117
- id: cargo-fmt-pyth-solana-receiver
118118
name: Cargo format for solana target chain contract
119119
language: "rust"
120-
entry: cargo +nightly-2023-03-01 fmt --manifest-path ./target_chains/solana/Cargo.toml --all -- --config-path rustfmt.toml
120+
entry: cargo +1.73.0 fmt --manifest-path ./target_chains/solana/Cargo.toml --all
121121
pass_filenames: false
122122
files: target_chains/solana
123123
- id: cargo-clippy-pyth-solana-receiver

rustfmt.toml

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)