Merge branch 'release_23.0' into release_23.1

ahmedhamidawan · Oct 5, 2023 · b40f108 · b40f108
2 parents 84f08b2 + ea2be33
commit b40f108
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/client/src/components/WorkflowInvocationState/InvocationMessage.vue b/client/src/components/WorkflowInvocationState/InvocationMessage.vue
@@ -146,6 +146,9 @@ const infoString = computed(() => {
             invocationMessage.workflow_step_id + 1
         } is a conditional step and the result of the when expression is not a boolean type.`;
     } else if (reason === "unexpected_failure") {
+        if (invocationMessage.details) {
+            return `${failFragment} an unexpected failure occurred: '${invocationMessage.details}'`;
+        }
         return `${failFragment} an unexpected failure occurred.`;
     } else if (reason === "workflow_output_not_found") {
         return `Defined workflow output '${invocationMessage.output_name}' was not found in step ${

diff --git a/doc/source/conf.versioning.py b/doc/source/conf.versioning.py
@@ -47,7 +47,7 @@
         if Version(_ver) >= MIN_DOC_VERSION:
             simpleversioning_versions.append({"id": f"release_{_ver}", "name": _ver})
 
-if re.fullmatch(r"release_\d{2}\.\d{2}", TARGET_GIT_BRANCH):
+if re.fullmatch(r"release_\d{2}\.\d{1,2}", TARGET_GIT_BRANCH):
     if _stable:
         # The current stable release will go here but fail the next conditional, avoiding either banner.
         if TARGET_GIT_BRANCH != f"release_{_stable}":