Fix CI for running merge queues

Author: jfreire-unity

.yamato/analyze.yml

@@ -21,7 +21,7 @@ code_analyser:
       - targets:
           only:
             - "develop"
-            - "gh-readonly-queue/{base_branch}"
+            - "gh-readonly-queue/develop"
   artifacts:
     UTR_Output.zip:
       paths:

.yamato/format.yml

@@ -16,4 +16,4 @@ check_formatting:
       - targets:
           only:
             - "develop"
-            - "gh-readonly-queue/{base_branch}"
+            - "gh-readonly-queue/develop"

.yamato/promotion.yml

@@ -1,24 +1,24 @@
-#{% metadata_file .yamato/config.metadata %}
-#---
-#
-#promote:
-#  name: Promote to Production
-#  agent:
-#    type: Unity::VM
-#    image: package-ci/win10:default
-#    flavor: b1.large
-#  dependencies:
-#    - .yamato/publish-samples.yml 
-#  variables:
-#    UPMCI_PROMOTION: 1
-#  commands:
-#    - move /Y .\Assets\Samples .\Packages\com.unity.inputsystem
-#    - xcopy /Y /H .\Assets\Samples.meta .\Packages\com.unity.inputsystem
-#    - del /AH .\Assets\Samples.meta
-#    - {{ upm_ci_install }}
-#    - upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
-#    - upm-ci package promote --package-path ./Packages/com.unity.inputsystem/
-#  artifacts:
-#    artifacts:
-#      paths:
-#        - "upm-ci~/**/*"
+{% metadata_file .yamato/config.metadata %}
+---
+
+promote:
+  name: Promote to Production
+  agent:
+    type: Unity::VM
+    image: package-ci/win10:default
+    flavor: b1.large
+  dependencies:
+    - .yamato/publish-samples.yml 
+  variables:
+    UPMCI_PROMOTION: 1
+  commands:
+    - move /Y .\Assets\Samples .\Packages\com.unity.inputsystem
+    - xcopy /Y /H .\Assets\Samples.meta .\Packages\com.unity.inputsystem
+    - del /AH .\Assets\Samples.meta
+    - {{ upm_ci_install }}
+    - upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
+    - upm-ci package promote --package-path ./Packages/com.unity.inputsystem/
+  artifacts:
+    artifacts:
+      paths:
+        - "upm-ci~/**/*"

.yamato/publish-samples.yml

@@ -1,18 +1,18 @@
-#{% metadata_file .yamato/config.metadata %}
-#---
-#
-#test_sample_projects:
-#  name : Publish Sample Projects
-#  agent:
-#    type: Unity::VM::osx
-#    image: package-ci/macos-12:default
-#    flavor: m1.mac
-#  commands:
-#    - {{ upm_ci_install }}
-#    - upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
-#    - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u 2019.4
-#    - Editor=.Editor/Unity.app/Contents/MacOS/Unity Method=Publish sh ExternalSampleProjects/publish.sh 
-#  artifacts:
-#    UTR_Output.zip:
-#      paths:
-#        - "upm-ci~/**/*"
+{% metadata_file .yamato/config.metadata %}
+---
+
+test_sample_projects:
+  name : Publish Sample Projects
+  agent:
+    type: Unity::VM::osx
+    image: package-ci/macos-12:default
+    flavor: m1.mac
+  commands:
+    - {{ upm_ci_install }}
+    - upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
+    - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u 2019.4
+    - Editor=.Editor/Unity.app/Contents/MacOS/Unity Method=Publish sh ExternalSampleProjects/publish.sh 
+  artifacts:
+    UTR_Output.zip:
+      paths:
+        - "upm-ci~/**/*"

.yamato/sonarqube.yml

@@ -36,4 +36,4 @@ Windows-Dotnet-SonarScanner:
       - targets:
           only:
             - "develop"
-            - "gh-readonly-queue/{base_branch}"
+            - "gh-readonly-queue/develop"

.yamato/test-samples.yml

@@ -18,7 +18,7 @@ test_sample_projects_{{ editor.version }}:
       - targets:
           only:
             - "develop"
-            - "gh-readonly-queue/{base_branch}"
+            - "gh-readonly-queue/develop"
   artifacts:
     UTR_Output.zip:
       paths:

.yamato/upm-ci.yml

@@ -228,7 +228,7 @@ all_tests:
       - targets:
           only:
             - "develop"
-            - "gh-readonly-queue/{base_branch}"
+            - "gh-readonly-queue/develop"
 
 {% for run in (1..2) %}
 publish{% cycle "", "_dryrun" %}: