From dee96dba3e8af7e272cb40ec1dc3db184b38a74b Mon Sep 17 00:00:00 2001 From: Maciej Dudkowski Date: Tue, 30 Sep 2025 12:20:44 -0400 Subject: [PATCH 1/2] Switched to Rust 1.90 in CI --- .github/workflows/heavy.yml | 2 ++ .github/workflows/per-pr.yml | 2 +- core/src/internal_flags.rs | 1 + core/src/worker/mod.rs | 2 ++ core/src/worker/workflow/mod.rs | 1 + .../tests/trybuild/dupe_transitions_fail.stderr | 10 +++++----- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/heavy.yml b/.github/workflows/heavy.yml index 3c04d85fe..e3833f764 100644 --- a/.github/workflows/heavy.yml +++ b/.github/workflows/heavy.yml @@ -19,6 +19,8 @@ jobs: with: submodules: recursive - uses: dtolnay/rust-toolchain@stable + with: + toolchain: 1.90.0 - name: Install protoc uses: arduino/setup-protoc@v3 with: diff --git a/.github/workflows/per-pr.yml b/.github/workflows/per-pr.yml index 992f7f4b3..f60d0d160 100644 --- a/.github/workflows/per-pr.yml +++ b/.github/workflows/per-pr.yml @@ -21,7 +21,7 @@ jobs: submodules: recursive - uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.88.0 + toolchain: 1.90.0 - name: Install protoc uses: arduino/setup-protoc@v3 with: diff --git a/core/src/internal_flags.rs b/core/src/internal_flags.rs index 4a676da7a..df2fa5afb 100644 --- a/core/src/internal_flags.rs +++ b/core/src/internal_flags.rs @@ -18,6 +18,7 @@ use temporal_sdk_core_protos::temporal::api::{ /// may be removed from the enum. *Importantly*, all variants must be given explicit values, such /// that removing older variants does not create any change in existing values. Removed flag /// variants must be reserved forever (a-la protobuf), and should be called out in a comment. +#[allow(unreachable_pub)] // re-exported in test_help::integ_helpers #[repr(u32)] #[derive(PartialEq, Eq, PartialOrd, Ord, Hash, Copy, Clone, Debug, enum_iterator::Sequence)] pub enum CoreInternalFlags { diff --git a/core/src/worker/mod.rs b/core/src/worker/mod.rs index e88eb07d1..89bb379db 100644 --- a/core/src/worker/mod.rs +++ b/core/src/worker/mod.rs @@ -18,6 +18,8 @@ pub(crate) use activities::{ NewLocalAct, }; pub(crate) use wft_poller::WFTPollerShared; + +#[allow(unreachable_pub)] // re-exported in test_help::integ_helpers pub use workflow::LEGACY_QUERY_ID; use crate::{ diff --git a/core/src/worker/workflow/mod.rs b/core/src/worker/workflow/mod.rs index 33b9c6dac..77d07025f 100644 --- a/core/src/worker/workflow/mod.rs +++ b/core/src/worker/workflow/mod.rs @@ -99,6 +99,7 @@ use tracing::Span; /// Id used by server for "legacy" queries. IE: Queries that come in the `query` rather than /// `queries` field of a WFT, and are responded to on the separate `respond_query_task_completed` /// rpc. +#[allow(unreachable_pub)] // re-exported in supermodule pub const LEGACY_QUERY_ID: &str = "legacy_query"; /// What percentage of a WFT timeout we are willing to wait before sending a WFT heartbeat when /// necessary. diff --git a/fsm/rustfsm_procmacro/tests/trybuild/dupe_transitions_fail.stderr b/fsm/rustfsm_procmacro/tests/trybuild/dupe_transitions_fail.stderr index 3e0ee1f40..f16c35878 100644 --- a/fsm/rustfsm_procmacro/tests/trybuild/dupe_transitions_fail.stderr +++ b/fsm/rustfsm_procmacro/tests/trybuild/dupe_transitions_fail.stderr @@ -1,11 +1,11 @@ error: Duplicate transitions are not allowed! --> $DIR/dupe_transitions_fail.rs:5:1 | -5 | / fsm! { -6 | | name SimpleMachine; command SimpleMachineCommand; error Infallible; -7 | | -8 | | One --(A)--> Two; -9 | | One --(A)--> Two; + 5 | / fsm! { + 6 | | name SimpleMachine; command SimpleMachineCommand; error Infallible; + 7 | | + 8 | | One --(A)--> Two; + 9 | | One --(A)--> Two; 10 | | } | |_^ | From 0ca6c62fe78b77dd964805d034543757698904e0 Mon Sep 17 00:00:00 2001 From: Maciej Dudkowski Date: Tue, 30 Sep 2025 12:30:50 -0400 Subject: [PATCH 2/2] Updated Rust in remaining CI jobs too --- .github/workflows/per-pr.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/per-pr.yml b/.github/workflows/per-pr.yml index f60d0d160..e80354428 100644 --- a/.github/workflows/per-pr.yml +++ b/.github/workflows/per-pr.yml @@ -58,7 +58,7 @@ jobs: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.88.0 + toolchain: 1.90.0 - name: Install protoc uses: arduino/setup-protoc@v3 with: @@ -106,7 +106,7 @@ jobs: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.88.0 + toolchain: 1.90.0 - name: Install protoc uses: arduino/setup-protoc@v3 with: @@ -139,7 +139,7 @@ jobs: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.88.0 + toolchain: 1.90.0 - name: Install protoc uses: arduino/setup-protoc@v3 with: @@ -164,7 +164,7 @@ jobs: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.88.0 + toolchain: 1.90.0 - name: Install protoc uses: arduino/setup-protoc@v3 with: @@ -185,7 +185,7 @@ jobs: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.88.0 + toolchain: 1.90.0 - name: Install protoc uses: arduino/setup-protoc@v3 with: