Skip to content

Commit ed0f273

Browse files
authored
chore: switch to stable rust versions (#2093)
* chore(apps/hermes): switch to stable rust * chore(apps/fortuna): update to stable rust * chore: remove commented feature * chore(governance): use proper Rust version for remote executor in CI * chore(target_chains/cosmwasm): fix Rust version in CI * chore(pythnet/message_buffer): use proper Rust version in CI * chore(pythnet/pythnet_sdk): fix Rust version * chore(target_chains/solana): fix Rust version in CI
1 parent c128715 commit ed0f273

34 files changed

+151
-121
lines changed

.github/workflows/ci-cosmwasm-contract.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ jobs:
2323
working-directory: target_chains/cosmwasm/contracts/pyth
2424
steps:
2525
- uses: actions/checkout@v2
26+
- uses: actions-rs/toolchain@v1
27+
with:
28+
profile: minimal
29+
toolchain: 1.82.0
30+
components: rustfmt, clippy
31+
override: true
2632
- name: Build
2733
run: cargo build --verbose
2834
- name: Run tests

.github/workflows/ci-fortuna.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions-rs/toolchain@v1
1515
with:
1616
profile: minimal
17-
toolchain: nightly-2023-07-23
17+
toolchain: 1.82.0
1818
override: true
1919
- name: Run executor tests
2020
run: cargo test --manifest-path ./apps/fortuna/Cargo.toml

.github/workflows/ci-hermes-server.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions-rs/toolchain@v1
1515
with:
1616
profile: minimal
17-
toolchain: nightly-2024-03-26
17+
toolchain: 1.82.0
1818
components: rustfmt, clippy
1919
override: true
2020
- name: Install protoc

.github/workflows/ci-message-buffer-idl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- uses: actions-rs/toolchain@v1
2222
with:
2323
profile: minimal
24-
toolchain: nightly-2023-03-01
24+
toolchain: 1.66.1
2525
components: rustfmt, clippy
2626
- name: Install Solana
2727
run: |

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,21 @@ jobs:
3737
profile: minimal
3838
toolchain: nightly-2024-08-04
3939
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
53+
toolchain: 1.82.0
54+
components: rustfmt, clippy
4055
- name: Install protoc
4156
uses: arduino/setup-protoc@v3
4257
- uses: actions/checkout@v4

.github/workflows/ci-solana-contract.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ jobs:
2323
working-directory: target_chains/solana
2424
steps:
2525
- uses: actions/checkout@v2
26+
- uses: actions-rs/toolchain@v1
27+
with:
28+
profile: minimal
29+
toolchain: 1.73.0
30+
override: true
2631
- name: Install Solana
2732
run: |
2833
sh -c "$(curl -sSfL https://release.solana.com/v1.16.20/install)"

.pre-commit-config.yaml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ repos:
3030
- id: cargo-clippy-remote-executor
3131
name: Cargo clippy for remote executor
3232
language: "rust"
33-
entry: cargo +nightly-2023-03-01 clippy --manifest-path ./governance/remote_executor/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings
33+
entry: cargo +1.66.1 clippy --manifest-path ./governance/remote_executor/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings
3434
pass_filenames: false
3535
files: governance/remote_executor
3636
# Hooks for cosmwasm contract
@@ -43,7 +43,7 @@ repos:
4343
- id: cargo-clippy-cosmwasm
4444
name: Cargo clippy for cosmwasm contract
4545
language: "rust"
46-
entry: cargo +nightly-2023-03-01 clippy --manifest-path ./target_chains/cosmwasm/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings
46+
entry: cargo +1.82.0 clippy --manifest-path ./target_chains/cosmwasm/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings
4747
pass_filenames: false
4848
files: target_chains/cosmwasm
4949
# Hooks for Hermes
@@ -56,7 +56,7 @@ repos:
5656
- id: cargo-clippy-hermes
5757
name: Cargo clippy for Hermes
5858
language: "rust"
59-
entry: cargo +nightly-2024-03-26 clippy --manifest-path ./apps/hermes/server/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings
59+
entry: cargo +1.82.0 clippy --manifest-path ./apps/hermes/server/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings
6060
pass_filenames: false
6161
files: apps/hermes
6262
# Hooks for Fortuna
@@ -66,6 +66,12 @@ repos:
6666
entry: cargo +nightly-2023-07-23 fmt --manifest-path ./apps/fortuna/Cargo.toml --all -- --config-path rustfmt.toml
6767
pass_filenames: false
6868
files: apps/fortuna
69+
- id: cargo-clippy-fortuna
70+
name: Cargo clippy for Fortuna
71+
language: "rust"
72+
entry: cargo +1.82.0 clippy --manifest-path ./apps/fortuna/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings
73+
pass_filenames: false
74+
files: apps/fortuna
6975
# Hooks for message buffer contract
7076
- id: cargo-fmt-message-buffer
7177
name: Cargo format for message buffer contract
@@ -76,7 +82,7 @@ repos:
7682
- id: cargo-clippy-message-buffer
7783
name: Cargo clippy for message buffer contract
7884
language: "rust"
79-
entry: cargo +nightly-2023-03-01 clippy --manifest-path ./pythnet/message_buffer/Cargo.toml --tests --fix --allow-dirty --allow-staged --features test-bpf -- -D warnings
85+
entry: cargo +1.66.1 clippy --manifest-path ./pythnet/message_buffer/Cargo.toml --tests --fix --allow-dirty --allow-staged --features test-bpf -- -D warnings
8086
pass_filenames: false
8187
files: pythnet/message_buffer
8288
# Hooks for pythnet_sdk
@@ -89,7 +95,7 @@ repos:
8995
- id: cargo-clippy-pythnet-sdk
9096
name: Cargo clippy for pythnet SDK
9197
language: "rust"
92-
entry: cargo +nightly-2024-08-04 clippy --manifest-path ./pythnet/pythnet_sdk/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings
98+
entry: cargo +1.82.0 clippy --manifest-path ./pythnet/pythnet_sdk/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings
9399
pass_filenames: false
94100
files: pythnet/pythnet_sdk
95101
# Hooks for solana receiver contract
@@ -102,7 +108,7 @@ repos:
102108
- id: cargo-clippy-pyth-solana-receiver
103109
name: Cargo clippy for solana target chain contract
104110
language: "rust"
105-
entry: cargo +nightly-2023-03-01 clippy --manifest-path ./target_chains/solana/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings
111+
entry: cargo +1.73.0 clippy --manifest-path ./target_chains/solana/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings
106112
pass_filenames: false
107113
files: target_chains/solana
108114
# For express relay python files

apps/fortuna/Cargo.lock

Lines changed: 22 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/fortuna/Dockerfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
ARG RUST_VERSION=1.66.1
1+
ARG RUST_VERSION=1.82.0
22

33
FROM rust:${RUST_VERSION} AS build
44

5-
# Set default toolchain
6-
RUN rustup default nightly-2023-07-23
7-
85
# Build
96
WORKDIR /src
107
COPY apps/fortuna apps/fortuna

apps/fortuna/rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2023-07-23
1+
1.82.0

0 commit comments

Comments
 (0)