From 7cd14deb17bb8891cf333a6127bb4c83a85f14de Mon Sep 17 00:00:00 2001 From: James Watkins-Harvey Date: Wed, 11 Feb 2026 23:09:19 -0500 Subject: [PATCH 1/3] Bump API submodule to 1.61.0 --- .../io/temporal/workflow/updateTest/UpdateWithStartTest.java | 1 + temporal-serviceclient/src/main/proto | 2 +- .../io/temporal/internal/testservice/TestWorkflowService.java | 4 ++++ .../testserver/functional/WorkflowIdReusePolicyTest.java | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/updateTest/UpdateWithStartTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/updateTest/UpdateWithStartTest.java index fa2b0ca40b..12b3e0c236 100644 --- a/temporal-sdk/src/test/java/io/temporal/workflow/updateTest/UpdateWithStartTest.java +++ b/temporal-sdk/src/test/java/io/temporal/workflow/updateTest/UpdateWithStartTest.java @@ -646,6 +646,7 @@ public void failWhenUpdateNamesDoNotMatch() { } @Test + @SuppressWarnings("deprecation") // Test uses deprecated policy for validation public void failServerSideWhenStartIsInvalid() { WorkflowClient workflowClient = testWorkflowRule.getWorkflowClient(); diff --git a/temporal-serviceclient/src/main/proto b/temporal-serviceclient/src/main/proto index 1ae5b673d6..831177c393 160000 --- a/temporal-serviceclient/src/main/proto +++ b/temporal-serviceclient/src/main/proto @@ -1 +1 @@ -Subproject commit 1ae5b673d66b0a94f6131c3eb06bc7173ae2c326 +Subproject commit 831177c393bb2d8d96d35c5b841453ac4cb45334 diff --git a/temporal-test-server/src/main/java/io/temporal/internal/testservice/TestWorkflowService.java b/temporal-test-server/src/main/java/io/temporal/internal/testservice/TestWorkflowService.java index 469fde42df..92004cdf3c 100644 --- a/temporal-test-server/src/main/java/io/temporal/internal/testservice/TestWorkflowService.java +++ b/temporal-test-server/src/main/java/io/temporal/internal/testservice/TestWorkflowService.java @@ -310,6 +310,8 @@ public void startWorkflowExecution( } } + @SuppressWarnings( + "deprecation") // Backwards compatibility for WORKFLOW_ID_REUSE_POLICY_TERMINATE_IF_RUNNING StartWorkflowExecutionResponse startWorkflowExecutionImpl( StartWorkflowExecutionRequest startRequest, Duration backoffStartInterval, @@ -475,6 +477,8 @@ private StartWorkflowExecutionResponse throwDuplicatedWorkflow( WorkflowExecutionAlreadyStartedFailure.getDescriptor()); } + @SuppressWarnings( + "deprecation") // Backwards compatibility for WORKFLOW_ID_REUSE_POLICY_TERMINATE_IF_RUNNING private void validateWorkflowIdReusePolicy( WorkflowIdReusePolicy reusePolicy, WorkflowIdConflictPolicy conflictPolicy) { if (conflictPolicy != WorkflowIdConflictPolicy.WORKFLOW_ID_CONFLICT_POLICY_UNSPECIFIED diff --git a/temporal-test-server/src/test/java/io/temporal/testserver/functional/WorkflowIdReusePolicyTest.java b/temporal-test-server/src/test/java/io/temporal/testserver/functional/WorkflowIdReusePolicyTest.java index 989dd81500..5b3cb04017 100644 --- a/temporal-test-server/src/test/java/io/temporal/testserver/functional/WorkflowIdReusePolicyTest.java +++ b/temporal-test-server/src/test/java/io/temporal/testserver/functional/WorkflowIdReusePolicyTest.java @@ -80,6 +80,7 @@ public void alreadyRunningWorkflowBlocksSecondEvenWithAllowDuplicate() { } @Test + @SuppressWarnings("deprecation") // Test for deprecated policy behavior public void secondWorkflowTerminatesFirst() { String workflowId = "terminate-if-running-1"; WorkflowOptions options = From ddbbaebad1620641ab8a26282fedbfd49700771a Mon Sep 17 00:00:00 2001 From: James Watkins-Harvey Date: Thu, 19 Feb 2026 17:06:26 -0500 Subject: [PATCH 2/3] Bump test timeout to avoid recurrent CI flake --- .../temporal/workflow/queryTests/LocalActivityAndQueryTest.java | 2 +- temporal-serviceclient/src/main/proto | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/queryTests/LocalActivityAndQueryTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/queryTests/LocalActivityAndQueryTest.java index 5785d0d777..8cb58ce603 100644 --- a/temporal-sdk/src/test/java/io/temporal/workflow/queryTests/LocalActivityAndQueryTest.java +++ b/temporal-sdk/src/test/java/io/temporal/workflow/queryTests/LocalActivityAndQueryTest.java @@ -37,7 +37,7 @@ public class LocalActivityAndQueryTest { .setActivityImplementations(activitiesImpl) .build(); - @Test + @Test(timeout = 20_000) public void testLocalActivityAndQuery() throws ExecutionException, InterruptedException { WorkflowOptions options = WorkflowOptions.newBuilder() diff --git a/temporal-serviceclient/src/main/proto b/temporal-serviceclient/src/main/proto index 831177c393..1ae5b673d6 160000 --- a/temporal-serviceclient/src/main/proto +++ b/temporal-serviceclient/src/main/proto @@ -1 +1 @@ -Subproject commit 831177c393bb2d8d96d35c5b841453ac4cb45334 +Subproject commit 1ae5b673d66b0a94f6131c3eb06bc7173ae2c326 From 72b84000a8cac333e73b734910ea6d68b8d525b4 Mon Sep 17 00:00:00 2001 From: James Watkins-Harvey Date: Thu, 19 Feb 2026 17:14:39 -0500 Subject: [PATCH 3/3] Restore dynamic config to resolve flaky test --- .github/workflows/ci.yml | 1 + .../temporal/workflow/queryTests/LocalActivityAndQueryTest.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9749a74cae..5512996e31 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -93,6 +93,7 @@ jobs: --search-attribute CustomDoubleField=Double \ --search-attribute CustomBoolField=Bool \ --dynamic-config-value system.enableActivityEagerExecution=true \ + --dynamic-config-value history.MaxBufferedQueryCount=10000 \ --dynamic-config-value frontend.workerVersioningDataAPIs=true \ --dynamic-config-value component.nexusoperations.recordCancelRequestCompletionEvents=true \ --dynamic-config-value component.callbacks.allowedAddresses='[{"Pattern":"*","AllowInsecure":true}]' \ diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/queryTests/LocalActivityAndQueryTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/queryTests/LocalActivityAndQueryTest.java index 8cb58ce603..5785d0d777 100644 --- a/temporal-sdk/src/test/java/io/temporal/workflow/queryTests/LocalActivityAndQueryTest.java +++ b/temporal-sdk/src/test/java/io/temporal/workflow/queryTests/LocalActivityAndQueryTest.java @@ -37,7 +37,7 @@ public class LocalActivityAndQueryTest { .setActivityImplementations(activitiesImpl) .build(); - @Test(timeout = 20_000) + @Test public void testLocalActivityAndQuery() throws ExecutionException, InterruptedException { WorkflowOptions options = WorkflowOptions.newBuilder()