Merge branch 'main' into feat_no_output_timeout_param

game-ci · Sep 19, 2022 · 284bc96 · 284bc96
2 parents caa714a + cc81411
commit 284bc96
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/src/jobs/build.yml b/src/jobs/build.yml
@@ -65,8 +65,14 @@ parameters:
       If left to "false" for decompressed WebGL builds, you can run the project directly from the CircleCI web app.
   no_output_timeout:
     type: string
-    default: "10m"
+    default: "20m"
     description: Elapsed time the command can run without output.
+  return-license:
+    type: boolean
+    default: false
+    description: |
+      Whether to return the license used to build the project.
+      Unity only allows returning professional licenses.
 
 executor: << parameters.executor >>
 
@@ -90,3 +96,9 @@ steps:
   - return-license:
       unity-username-var-name: << parameters.unity-username-var-name >>
       unity-password-var-name: << parameters.unity-password-var-name >>
+  - when:
+      condition: <<parameters.return-license>>
+      steps:
+        - return-license:
+            unity-username-var-name: << parameters.unity-username-var-name >>
+            unity-password-var-name: << parameters.unity-password-var-name >>
diff --git a/src/jobs/test.yml b/src/jobs/test.yml
@@ -48,8 +48,14 @@ parameters:
       More information can be found on: https://docs.unity3d.com/Packages/com.unity.test-framework@2.0/manual/reference-command-line.html
   no_output_timeout:
     type: string
-    default: "10m"
+    default: "20m"
     description: Elapsed time the command can run without output.
+  return-license:
+    type: boolean
+    default: false
+    description: |
+      Whether to return the license used to test the project.
+      Unity only allows returning professional licenses.
 
 executor: << parameters.executor >>
 
@@ -70,3 +76,9 @@ steps:
   - return-license:
       unity-username-var-name: << parameters.unity-username-var-name >>
       unity-password-var-name: << parameters.unity-password-var-name >>
+  - when:
+      condition: <<parameters.return-license>>
+      steps:
+        - return-license:
+            unity-username-var-name: << parameters.unity-username-var-name >>
+            unity-password-var-name: << parameters.unity-password-var-name >>