Skip to content

Commit 41c9ea7

Browse files
authored
Merge branch 'main' into bump-ui
2 parents 060ac93 + a99c9ed commit 41c9ea7

9 files changed

Lines changed: 2117 additions & 118 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
- name: Test cloud API key env var
109109
if: ${{ matrix.cloudTestTarget && env.HAS_SECRETS == 'true' }}
110110
env:
111-
TEMPORAL_ADDRESS: us-west-2.aws.api.temporal.io:7233
111+
TEMPORAL_ADDRESS: us-east-1.aws.api.temporal.io:7233
112112
TEMPORAL_NAMESPACE: ${{ vars.TEMPORAL_CLIENT_NAMESPACE }}
113113
TEMPORAL_API_KEY: ${{ secrets.TEMPORAL_CLIENT_CLOUD_API_KEY }}
114114
shell: bash
@@ -117,7 +117,7 @@ jobs:
117117
- name: Test cloud API key arg
118118
if: ${{ matrix.cloudTestTarget && env.HAS_SECRETS == 'true' }}
119119
env:
120-
TEMPORAL_ADDRESS: us-west-2.aws.api.temporal.io:7233
120+
TEMPORAL_ADDRESS: us-east-1.aws.api.temporal.io:7233
121121
TEMPORAL_NAMESPACE: ${{ vars.TEMPORAL_CLIENT_NAMESPACE }}
122122
shell: bash
123123
run: go run ./cmd/temporal workflow list --limit 2 --api-key ${{ secrets.TEMPORAL_CLIENT_CLOUD_API_KEY }}

internal/devserver/server.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import (
3939
uiconfig "github.com/temporalio/ui-server/v2/server/config"
4040
uiserveroptions "github.com/temporalio/ui-server/v2/server/server_options"
4141
"go.temporal.io/api/enums/v1"
42+
"go.temporal.io/server/chasm/lib/activity"
4243
"go.temporal.io/server/common/authorization"
4344
"go.temporal.io/server/common/cluster"
4445
"go.temporal.io/server/common/config"
@@ -240,6 +241,11 @@ func (s *StartOptions) buildServerOptions() ([]temporal.ServerOption, *slog.Leve
240241
// Up default visibility RPS
241242
dynConf[dynamicconfig.FrontendMaxNamespaceVisibilityRPSPerInstance.Key()] = 100
242243

244+
// Enable CHASM and SAA. These will be on by default in server v1.32, at which point these lines
245+
// should be removed.
246+
dynConf[dynamicconfig.EnableChasm.Key()] = true
247+
dynConf[activity.Enabled.Key()] = true
248+
243249
// Dynamic config if set
244250
for k, v := range s.DynamicConfigValues {
245251
dynConf[dynamicconfig.MakeKey(k)] = v

0 commit comments

Comments
 (0)