Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"require": {
"php": "^8.2",
"apache/avro": "^1.12",
"durable-workflow/workflow": "2.0.0-rc.53",
"durable-workflow/workflow": "2.0.0-rc.55",
"laravel/framework": "^13.0",
"laravel/tinker": "^3.0"
},
Expand Down Expand Up @@ -47,7 +47,7 @@
},
"extra": {
"durable-workflow": {
"product-train": "2.0.0-rc.68"
"product-train": "2.0.0-rc.69"
},
"laravel": {
"dont-discover": []
Expand Down
16 changes: 8 additions & 8 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions docker-compose.memo-rolling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ services:
command: ["server-bootstrap"]
environment:
<<: *runtime-environment
APP_VERSION: ${APP_VERSION:-2.0.0-rc.68}
APP_VERSION: ${APP_VERSION:-2.0.0-rc.69}

successor:
image: ${DW_MEMO_SUCCESSOR_IMAGE:-durable-workflow/server-memo-rolling:local}
ports: !override []
environment:
<<: *runtime-environment
APP_VERSION: ${APP_VERSION:-2.0.0-rc.68}
APP_VERSION: ${APP_VERSION:-2.0.0-rc.69}
DW_SERVER_ID: memo-successor
DW_SERVER_TOPOLOGY_SHAPE: standalone_server
DW_SERVER_PROCESS_CLASS: server_http_node
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.small-cluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ x-server-build: &server-build
x-server-environment: &server-environment
APP_NAME: "Durable Workflow Server"
APP_ENV: testing
APP_VERSION: ${APP_VERSION:-2.0.0-rc.68}
APP_VERSION: ${APP_VERSION:-2.0.0-rc.69}
APP_DEBUG: "false"
DW_SERVER_KEY: ${DW_SERVER_KEY:-base64:5Zt4nUhlCm3DD0nLXZJQdHiwPfb56yGo9gNV/g3jYbY=}
DB_CONNECTION: ${DW_SMALL_CLUSTER_DB:-mysql}
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
DW_SERVER_KEY: "${DW_SERVER_KEY:-}"
DW_SERVER_TOPOLOGY_SHAPE: standalone_server
DW_SERVER_PROCESS_CLASS: server_http_node
APP_VERSION: "${APP_VERSION:-2.0.0-rc.68}"
APP_VERSION: "${APP_VERSION:-2.0.0-rc.69}"
APP_DEBUG: "false"
DB_CONNECTION: mysql
DB_HOST: mysql
Expand Down Expand Up @@ -54,7 +54,7 @@ services:
APP_NAME: "Durable Workflow Server"
APP_ENV: local
DW_SERVER_KEY: "${DW_SERVER_KEY:-}"
APP_VERSION: "${APP_VERSION:-2.0.0-rc.68}"
APP_VERSION: "${APP_VERSION:-2.0.0-rc.69}"
APP_DEBUG: "false"
DB_CONNECTION: mysql
DB_HOST: mysql
Expand Down Expand Up @@ -107,7 +107,7 @@ services:
DW_SERVER_KEY: "${DW_SERVER_KEY:-}"
DW_SERVER_TOPOLOGY_SHAPE: standalone_server
DW_SERVER_PROCESS_CLASS: worker_node
APP_VERSION: "${APP_VERSION:-2.0.0-rc.68}"
APP_VERSION: "${APP_VERSION:-2.0.0-rc.69}"
DB_CONNECTION: mysql
DB_HOST: mysql
DB_PORT: 3306
Expand Down Expand Up @@ -153,7 +153,7 @@ services:
DW_SERVER_KEY: "${DW_SERVER_KEY:-}"
DW_SERVER_TOPOLOGY_SHAPE: standalone_server
DW_SERVER_PROCESS_CLASS: scheduler_node
APP_VERSION: "${APP_VERSION:-2.0.0-rc.68}"
APP_VERSION: "${APP_VERSION:-2.0.0-rc.69}"
DB_CONNECTION: mysql
DB_HOST: mysql
DB_PORT: 3306
Expand Down
8 changes: 5 additions & 3 deletions k8s/helm/durable-workflow/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ type: application
# The chart's own semver version. Bumped on every chart release; treated as
# independent of the server image version (appVersion). Breaking-change rules
# for this version live in docs/helm-upgrading.md alongside the chart.
version: 0.1.64
version: 0.1.65
# The immutable Durable Workflow Server identity this chart release packages.
# The onboarding default in values.yaml is generated from the separately
# qualified compatibility authority; appVersion remains release metadata.
appVersion: "2.0.0-rc.68"
appVersion: "2.0.0-rc.69"
kubeVersion: ">=1.27.0-0"
home: https://durable-workflow.github.io/docs/2.0/deployment
sources:
Expand All @@ -30,12 +30,14 @@ annotations:
# exact commit that most recently changed the packaged chart.
org.opencontainers.image.source: https://github.com/durable-workflow/server
dev.durable-workflow.source-revision: "unreleased"
dev.durable-workflow.image-reference: "docker.io/durableworkflow/server:2.0.0-rc.68"
dev.durable-workflow.image-reference: "docker.io/durableworkflow/server:2.0.0-rc.69"
artifacthub.io/license: MIT
artifacthub.io/category: integration-delivery
# Free-form changelog used by Artifact Hub. Keep the most recent chart-version
# entry first; do not rewrite past entries.
artifacthub.io/changes: |
- kind: fixed
description: Ship the durable signal-resume parallel-sequence repair with Workflow 2.0.0-rc.55 in Server 2.0.0-rc.69.
- kind: fixed
description: Pin the packaged Workflow engine to 2.0.0-rc.53 in Server 2.0.0-rc.68.
- kind: fixed
Expand Down
4 changes: 2 additions & 2 deletions k8s/helm/durable-workflow/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Redis — that is intentional, not a bug.
```bash
helm install durable-workflow \
oci://ghcr.io/durable-workflow/charts/durable-workflow \
--version 0.1.64 \
--version 0.1.65 \
--namespace durable-workflow --create-namespace \
-f my-values.yaml
```
Expand All @@ -59,7 +59,7 @@ helm install durable-workflow \
helm repo add durable-workflow https://durable-workflow.github.io/charts/
helm repo update
helm install durable-workflow durable-workflow/durable-workflow \
--version 0.1.64 \
--version 0.1.65 \
--namespace durable-workflow --create-namespace \
-f my-values.yaml
```
Expand Down
2 changes: 1 addition & 1 deletion k8s/helm/durable-workflow/ci/existing-secrets-values.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# CI fixture: GitOps / externally-managed-secret path. The chart consumes
# existing Secrets and renders no Secret resources of its own.
image:
tag: "2.0.0-rc.68"
tag: "2.0.0-rc.69"

externalDatabase:
connection: pgsql
Expand Down
2 changes: 1 addition & 1 deletion k8s/helm/durable-workflow/ci/ingress-and-hpa-values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# CI fixture: ingress + autoscaling enabled. Exercises optional templates.
image:
tag: "2.0.0-rc.68"
tag: "2.0.0-rc.69"

externalDatabase:
connection: mysql
Expand Down
2 changes: 1 addition & 1 deletion k8s/helm/durable-workflow/ci/inline-secrets-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# chart's render path is exercised end-to-end. Real deployments should use
# existingSecret instead.
image:
tag: "2.0.0-rc.68"
tag: "2.0.0-rc.69"

externalDatabase:
connection: mysql
Expand Down
4 changes: 2 additions & 2 deletions resources/release/source-release.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"schema": "durable-workflow.server.source-release/v1",
"server": {
"version": "2.0.0-rc.68"
"version": "2.0.0-rc.69"
},
"helm_chart": {
"version": "0.1.64"
"version": "0.1.65"
}
}
4 changes: 2 additions & 2 deletions tests/Feature/WorkerProtocolContractTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,9 @@ public function test_parallel_group_command_metadata_is_validated_and_persisted_

foreach (range(0, 2) as $index) {
$entries[] = [
'parallel_group_id' => 'parallel-calls:3:3',
'parallel_group_id' => 'parallel-calls:1:3',
'parallel_group_kind' => 'mixed',
'parallel_group_base_sequence' => 3,
'parallel_group_base_sequence' => 1,
'parallel_group_size' => 3,
'parallel_group_index' => $index,
];
Expand Down
2 changes: 1 addition & 1 deletion tests/Feature/WorkerProtocolSuccessContractTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -1951,7 +1951,7 @@ public function test_child_workflow_completion_resume_uses_worker_protocol_contr
->assertJsonPath('task.resume_source_kind', 'child_workflow_run')
->assertJsonPath('task.resume_source_id', $childRunId)
->assertJsonPath('task.child_workflow_run_id', $childRunId)
->assertJsonPath('task.workflow_sequence', 3)
->assertJsonPath('task.workflow_sequence', 1)
->assertJsonPath('task.workflow_event_type', 'ChildRunCompleted');

$childCallId = $parentResumePoll->json('task.child_call_id');
Expand Down
20 changes: 10 additions & 10 deletions tests/Unit/ReleaseImagePublishWorkflowContractTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -942,8 +942,8 @@ public function test_release_tag_source_guard_rejects_missing_wrong_and_moved_re

public function test_composer_metadata_identifies_the_exact_workflow_source(): void
{
$expectedVersion = '2.0.0-rc.53';
$expectedCommit = '62d6eabb10021e4ad72a3d813faa8e24b1c945af';
$expectedVersion = '2.0.0-rc.55';
$expectedCommit = '720512eefa0a5a97afeb410797cff8803ec76864';
$composer = json_decode($this->read('composer.json'), true, flags: JSON_THROW_ON_ERROR);
$lock = json_decode($this->read('composer.lock'), true, flags: JSON_THROW_ON_ERROR);

Expand Down Expand Up @@ -3223,11 +3223,11 @@ public function test_workflow_package_resolver_follows_the_composer_authority():
$outputs = file_get_contents($outputFile);
$this->assertNotFalse($outputs);
$this->assertStringContainsString("source=https://github.com/durable-workflow/workflow.git\n", $outputs);
$this->assertStringContainsString("ref=2.0.0-rc.53\n", $outputs);
$this->assertStringContainsString("tag=2.0.0-rc.53\n", $outputs);
$this->assertStringContainsString("commit=62d6eabb10021e4ad72a3d813faa8e24b1c945af\n", $outputs);
$this->assertStringContainsString("ref=2.0.0-rc.55\n", $outputs);
$this->assertStringContainsString("tag=2.0.0-rc.55\n", $outputs);
$this->assertStringContainsString("commit=720512eefa0a5a97afeb410797cff8803ec76864\n", $outputs);
$this->assertStringContainsString(
'Workflow package authority: 2.0.0-rc.53 at 62d6eabb10021e4ad72a3d813faa8e24b1c945af',
'Workflow package authority: 2.0.0-rc.55 at 720512eefa0a5a97afeb410797cff8803ec76864',
$result['stdout'],
);
} finally {
Expand All @@ -3243,15 +3243,15 @@ public function test_workflow_package_resolver_accepts_only_matching_caller_iden
try {
$result = $this->runScript('scripts/ci/select-compatible-workflow-package-ref.sh', [
'WORKFLOW_PACKAGE_SOURCE' => 'https://github.com/durable-workflow/workflow.git',
'WORKFLOW_PACKAGE_REF' => '2.0.0-rc.53',
'WORKFLOW_PACKAGE_COMMIT' => '62d6eabb10021e4ad72a3d813faa8e24b1c945af',
'WORKFLOW_PACKAGE_REF' => '2.0.0-rc.55',
'WORKFLOW_PACKAGE_COMMIT' => '720512eefa0a5a97afeb410797cff8803ec76864',
'GITHUB_OUTPUT' => $outputFile,
]);

$this->assertSame(0, $result['exitCode']);
$outputs = file_get_contents($outputFile);
$this->assertNotFalse($outputs);
$this->assertStringContainsString("tag=2.0.0-rc.53\n", $outputs);
$this->assertStringContainsString("tag=2.0.0-rc.55\n", $outputs);
} finally {
@unlink($outputFile);
}
Expand All @@ -3266,7 +3266,7 @@ public function test_workflow_package_resolver_rejects_a_stale_protocol_compatib

$this->assertSame(1, $result['exitCode']);
$this->assertStringContainsString(
'disagrees with the Composer Workflow package authority 2.0.0-rc.53',
'disagrees with the Composer Workflow package authority 2.0.0-rc.55',
$result['stderr'],
);
}
Expand Down