From d499e4427a5a0dd67f3e1c5b40d83fbfd1ee1888 Mon Sep 17 00:00:00 2001 From: James Watkins-Harvey Date: Mon, 30 Jun 2025 18:13:21 -0400 Subject: [PATCH 1/5] chore: Update Core in prep for v1.12.0 release --- packages/core-bridge/sdk-core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core-bridge/sdk-core b/packages/core-bridge/sdk-core index 1a3b41b3c..24a3c23a6 160000 --- a/packages/core-bridge/sdk-core +++ b/packages/core-bridge/sdk-core @@ -1 +1 @@ -Subproject commit 1a3b41b3c4ec5d800c84995748e9f16a67a9d4d9 +Subproject commit 24a3c23a6dc8842fddb5be3a52a534b863a01a7c From c85fd1b47f9fb3d5fd69715f607f394e00f2503a Mon Sep 17 00:00:00 2001 From: James Watkins-Harvey Date: Tue, 1 Jul 2025 00:35:48 -0400 Subject: [PATCH 2/5] Need latest rust --- .github/workflows/ci.yml | 5 +++++ .github/workflows/conventions.yml | 5 +++++ .github/workflows/release.yml | 5 +++++ .github/workflows/stress.yml | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b789fbc80..7de2e5e3f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,6 +77,11 @@ jobs: version: '23.x' repo-token: ${{ secrets.GITHUB_TOKEN }} + - name: Upgrade Rust to at least 1.88.0 + uses: dtolnay/rust-toolchain@stable + with: + toolchain: 1.88.0 + - name: Rust Cargo and Build cache if: steps.cached-artifact.outputs.cache-hit != 'true' uses: Swatinem/rust-cache@v2 diff --git a/.github/workflows/conventions.yml b/.github/workflows/conventions.yml index b8f6ee163..931d1fe6d 100644 --- a/.github/workflows/conventions.yml +++ b/.github/workflows/conventions.yml @@ -40,6 +40,11 @@ jobs: version: '23.x' repo-token: ${{ secrets.GITHUB_TOKEN }} + - name: Upgrade Rust to at least 1.88.0 + uses: dtolnay/rust-toolchain@stable + with: + toolchain: 1.88.0 + - name: Rust Cargo and Build cache uses: Swatinem/rust-cache@v2 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f506988b2..d6c30552b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -75,6 +75,11 @@ jobs: version: '23.x' repo-token: ${{ secrets.GITHUB_TOKEN }} + - name: Upgrade Rust to at least 1.88.0 + uses: dtolnay/rust-toolchain@stable + with: + toolchain: 1.88.0 + # FIXME: Setup volumes so that we can benefit from the cache in the Docker-build scenario. # Or maybe just get rid of the cache entirely if it doesn't have sufficient benefits. - name: Rust Cargo and Build cache diff --git a/.github/workflows/stress.yml b/.github/workflows/stress.yml index 0d7aec767..4c28969f6 100644 --- a/.github/workflows/stress.yml +++ b/.github/workflows/stress.yml @@ -83,6 +83,11 @@ jobs: version: '23.x' repo-token: ${{ secrets.GITHUB_TOKEN }} + - name: Upgrade Rust to at least 1.88.0 + uses: dtolnay/rust-toolchain@stable + with: + toolchain: 1.88.0 + - name: Rust Cargo and Build cache uses: Swatinem/rust-cache@v2 with: From aac3eb50f9987cbe7fbdaa543935759548f3cfb2 Mon Sep 17 00:00:00 2001 From: James Watkins-Harvey Date: Tue, 1 Jul 2025 00:57:43 -0400 Subject: [PATCH 3/5] Fix lint/build errors --- packages/test/src/test-bridge.ts | 4 ++-- packages/workflow/src/interfaces.ts | 4 ++-- packages/workflow/src/workflow.ts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/test/src/test-bridge.ts b/packages/test/src/test-bridge.ts index 04d930084..2605c762c 100644 --- a/packages/test/src/test-bridge.ts +++ b/packages/test/src/test-bridge.ts @@ -266,7 +266,7 @@ const GenericConfigs = { tuner: { workflowTaskSlotSupplier: { type: 'fixed-size', - numSlots: 1, + numSlots: 2, }, activityTaskSlotSupplier: { type: 'fixed-size', @@ -280,7 +280,7 @@ const GenericConfigs = { nonStickyToStickyPollRatio: 0.5, workflowTaskPollerBehavior: { type: 'simple-maximum', - maximum: 1, + maximum: 2, }, activityTaskPollerBehavior: { type: 'autoscaling', diff --git a/packages/workflow/src/interfaces.ts b/packages/workflow/src/interfaces.ts index 6ae15ff54..2c101387b 100644 --- a/packages/workflow/src/interfaces.ts +++ b/packages/workflow/src/interfaces.ts @@ -325,7 +325,7 @@ export interface ContinueAsNewOptions { * @deprecated In favor of the new Worker Deployment API. * @experimental The Worker Versioning API is still being designed. Major changes are expected. */ - versioningIntent?: VersioningIntent; + versioningIntent?: VersioningIntent; // eslint-disable-line deprecation/deprecation } /** @@ -496,7 +496,7 @@ export interface ChildWorkflowOptions extends Omit> & { diff --git a/packages/workflow/src/workflow.ts b/packages/workflow/src/workflow.ts index 745810f2b..2d5898865 100644 --- a/packages/workflow/src/workflow.ts +++ b/packages/workflow/src/workflow.ts @@ -195,7 +195,7 @@ function scheduleActivityNextHandler({ options, args, headers, seq, activityType headers, cancellationType: encodeActivityCancellationType(options.cancellationType), doNotEagerlyExecute: !(options.allowEagerDispatch ?? true), - versioningIntent: versioningIntentToProto(options.versioningIntent), + versioningIntent: versioningIntentToProto(options.versioningIntent), // eslint-disable-line deprecation/deprecation priority: options.priority ? compilePriority(options.priority) : undefined, }, }); From f4ada603b85c60428d47e825cc23e53e7dfc88c9 Mon Sep 17 00:00:00 2001 From: James Watkins-Harvey Date: Tue, 1 Jul 2025 01:07:12 -0400 Subject: [PATCH 4/5] Missing clippy --- .github/workflows/conventions.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/conventions.yml b/.github/workflows/conventions.yml index 931d1fe6d..e444bc51c 100644 --- a/.github/workflows/conventions.yml +++ b/.github/workflows/conventions.yml @@ -44,6 +44,7 @@ jobs: uses: dtolnay/rust-toolchain@stable with: toolchain: 1.88.0 + components: clippy - name: Rust Cargo and Build cache uses: Swatinem/rust-cache@v2 From a8a3602b967a437a786c75c64f6b18510b046b3d Mon Sep 17 00:00:00 2001 From: James Watkins-Harvey Date: Tue, 1 Jul 2025 11:26:22 -0400 Subject: [PATCH 5/5] Just upgrade rust, don't be specifc on rust version number --- .github/workflows/ci.yml | 4 +--- .github/workflows/conventions.yml | 3 +-- .github/workflows/release.yml | 4 +--- .github/workflows/stress.yml | 4 +--- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7de2e5e3f..fa095278a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,10 +77,8 @@ jobs: version: '23.x' repo-token: ${{ secrets.GITHUB_TOKEN }} - - name: Upgrade Rust to at least 1.88.0 + - name: Upgrade Rust to latest stable uses: dtolnay/rust-toolchain@stable - with: - toolchain: 1.88.0 - name: Rust Cargo and Build cache if: steps.cached-artifact.outputs.cache-hit != 'true' diff --git a/.github/workflows/conventions.yml b/.github/workflows/conventions.yml index e444bc51c..60288f307 100644 --- a/.github/workflows/conventions.yml +++ b/.github/workflows/conventions.yml @@ -40,10 +40,9 @@ jobs: version: '23.x' repo-token: ${{ secrets.GITHUB_TOKEN }} - - name: Upgrade Rust to at least 1.88.0 + - name: Upgrade Rust to latest stable uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.88.0 components: clippy - name: Rust Cargo and Build cache diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d6c30552b..80864e1c5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -75,10 +75,8 @@ jobs: version: '23.x' repo-token: ${{ secrets.GITHUB_TOKEN }} - - name: Upgrade Rust to at least 1.88.0 + - name: Upgrade Rust to latest stable uses: dtolnay/rust-toolchain@stable - with: - toolchain: 1.88.0 # FIXME: Setup volumes so that we can benefit from the cache in the Docker-build scenario. # Or maybe just get rid of the cache entirely if it doesn't have sufficient benefits. diff --git a/.github/workflows/stress.yml b/.github/workflows/stress.yml index 4c28969f6..de4254853 100644 --- a/.github/workflows/stress.yml +++ b/.github/workflows/stress.yml @@ -83,10 +83,8 @@ jobs: version: '23.x' repo-token: ${{ secrets.GITHUB_TOKEN }} - - name: Upgrade Rust to at least 1.88.0 + - name: Upgrade Rust to latest stable uses: dtolnay/rust-toolchain@stable - with: - toolchain: 1.88.0 - name: Rust Cargo and Build cache uses: Swatinem/rust-cache@v2