Merge branch '3.0.x' into 3.1.x

Closes gh-36025
spring-projects · Jun 22, 2023 · 5c53bda · 5c53bda
2 parents 31f218c + 1596f69
commit 5c53bda
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
@@ -399,6 +399,7 @@ jobs:
     trigger: false
   - task: stage
     image: ci-image
+    timeout: ((task-timeout))
     file: git-repo/ci/tasks/stage.yml
     params:
       RELEASE_TYPE: M
@@ -421,6 +422,7 @@ jobs:
     trigger: false
   - task: stage
     image: ci-image
+    timeout: ((task-timeout))
     file: git-repo/ci/tasks/stage.yml
     params:
       RELEASE_TYPE: RC
@@ -443,6 +445,7 @@ jobs:
     trigger: false
   - task: stage
     image: ci-image
+    timeout: ((task-timeout))
     file: git-repo/ci/tasks/stage.yml
     params:
       RELEASE_TYPE: RELEASE