Fix toolchain in CI jobs to Rust v1.85.0, same as MSRV

ljoss17 · ljoss17 · commit f5318f92bb3d · 2025-06-27T10:21:00.000+02:00
diff --git a/.github/workflows/cargo-doc.yaml b/.github/workflows/cargo-doc.yaml
@@ -28,7 +28,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable
+          toolchain: 1.85.0
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
         with:
diff --git a/.github/workflows/guide-templates.yaml b/.github/workflows/guide-templates.yaml
@@ -30,7 +30,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable
+          toolchain: 1.85.0
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
         with:
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
@@ -117,7 +117,7 @@ jobs:
           name: cosmos-nix
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable
+          toolchain: 1.85.0
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
         with:
@@ -159,7 +159,7 @@ jobs:
           name: cosmos-nix
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable
+          toolchain: 1.85.0
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
         with:
@@ -206,7 +206,7 @@ jobs:
           name: cosmos-nix
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable
+          toolchain: 1.85.0
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
         with:
@@ -253,7 +253,7 @@ jobs:
           name: cosmos-nix
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable
+          toolchain: 1.85.0
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
         with:
@@ -299,7 +299,7 @@ jobs:
           name: cosmos-nix
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable
+          toolchain: 1.85.0
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
         with:
@@ -347,7 +347,7 @@ jobs:
           name: cosmos-nix
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable
+          toolchain: 1.85.0
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
         with:
diff --git a/.github/workflows/misbehaviour.yml b/.github/workflows/misbehaviour.yml
@@ -79,7 +79,7 @@ jobs:
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable
+          toolchain: 1.85.0
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
         with:
@@ -135,7 +135,7 @@ jobs:
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable
+          toolchain: 1.85.0
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
         with:
@@ -191,7 +191,7 @@ jobs:
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable
+          toolchain: 1.85.0
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
         with:
@@ -247,7 +247,7 @@ jobs:
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable
+          toolchain: 1.85.0
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
         with:
diff --git a/.github/workflows/multi-chains.yaml b/.github/workflows/multi-chains.yaml
@@ -95,7 +95,7 @@ jobs:
           name: cosmos-nix
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable
+          toolchain: 1.85.0
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
         with:
diff --git a/.github/workflows/namada.yaml b/.github/workflows/namada.yaml
@@ -66,7 +66,7 @@ jobs:
           name: cosmos-nix
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable
+          toolchain: 1.85.0
       - name: Install libudev
         run: sudo apt-get update && sudo apt-get -y install libudev-dev
       - name: Install Protoc
@@ -153,7 +153,7 @@ jobs:
           echo "NAMADA_REPO_PATH=$(pwd)/namada" >> "$GITHUB_ENV"
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable
+          toolchain: 1.85.0
       - name: Install libudev
         run: sudo apt-get update && sudo apt-get -y install libudev-dev
       - name: Install Protoc
diff --git a/.github/workflows/publish-dry-run.yml b/.github/workflows/publish-dry-run.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable
+          toolchain: 1.85.0
       - uses: katyo/publish-crates@v2
         with:
           dry-run: true
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable
+          toolchain: 1.85.0
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
         with:
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -40,7 +40,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable
+          toolchain: 1.85.0
       - uses: actions-rs/cargo@v1
         with:
           command: fmt
@@ -52,7 +52,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable
+          toolchain: 1.85.0
           components: clippy
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
@@ -70,7 +70,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable
+          toolchain: 1.85.0
           components: clippy
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
@@ -89,7 +89,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable
+          toolchain: 1.85.0
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
         with:
@@ -111,7 +111,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable
+          toolchain: 1.85.0
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
         with:
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 [![Integration tests][test-image]][test-link]
 [![Apache 2.0 Licensed][license-image]][license-link]
 ![Rust Stable][rustc-image]
-![Rust 1.84+][rustc-version]
+![Rust 1.85+][rustc-version]
 
 Rust implementation of an Inter-Blockchain Communication (IBC) relayer.
 
diff --git a/crates/relayer/src/foreign_client.rs b/crates/relayer/src/foreign_client.rs
@@ -777,12 +777,12 @@ impl<DstChain: ChainHandle, SrcChain: ChainHandle> ForeignClient<DstChain, SrcCh
                     elapsed = ?elapsed,
                     "client state is not valid: latest height is outside of trusting period!",
                 );
-                return Err(ForeignClientError::expired_or_frozen(
+                Err(ForeignClientError::expired_or_frozen(
                     ExpiredOrFrozen::Expired,
                     self.id().clone(),
                     self.dst_chain.id(),
                     format!("time elapsed since last client update: {elapsed:?}"),
-                ));
+                ))
             }
             ConsensusStateTrusted::Trusted { elapsed } => Ok((client_state, Some(elapsed))),
         }
diff --git a/crates/telemetry/Cargo.toml b/crates/telemetry/Cargo.toml
@@ -7,7 +7,7 @@ readme       = "README.md"
 keywords     = ["cosmos", "ibc", "relayer", "telemetry"]
 repository   = "https://github.com/informalsystems/hermes"
 authors      = ["Informal Systems <hello@informal.systems>"]
-rust-version = "1.84.0"
+rust-version = "1.85.0"
 description  = """
     Telemetry service for the Hermes IBC relayer
 """
