From 6b4d821cb3b86d1de842fff6296bd11a5ed56dec Mon Sep 17 00:00:00 2001 From: michal-chrobot Date: Thu, 30 Oct 2025 12:56:21 +0100 Subject: [PATCH 1/8] Added u-pr config --- .pr_agent.toml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .pr_agent.toml diff --git a/.pr_agent.toml b/.pr_agent.toml new file mode 100644 index 0000000000..44bc7046fa --- /dev/null +++ b/.pr_agent.toml @@ -0,0 +1,2 @@ +[github_app] +pr_commands = [] From df66e90d3204bbb2e9698cb030164e9a0d62e592 Mon Sep 17 00:00:00 2001 From: michal-chrobot Date: Thu, 30 Oct 2025 13:13:03 +0100 Subject: [PATCH 2/8] re-added project pack job for updated dependencies test purpose --- .yamato/project-updated-dependencies-test.yml | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/.yamato/project-updated-dependencies-test.yml b/.yamato/project-updated-dependencies-test.yml index 1b3175443f..e8b51b9d32 100644 --- a/.yamato/project-updated-dependencies-test.yml +++ b/.yamato/project-updated-dependencies-test.yml @@ -42,7 +42,28 @@ updated-dependencies_{{ project.name }}_NGO_{{ platform.name }}_{{ editor }}: paths: - "upm-ci~/test-results/**/*" dependencies: - - .yamato/package-pack.yml#package_pack_-_ngo_{{ platform.name }} + - .yamato/project-updated-dependencies-test.yml#project_pack_-_{{ project.name }}_{{ platform.name }} {% endfor -%} {% endfor -%} {% endfor -%} + + +# TODO: This job was removed on PR-3711 but the above job somehow can find proper artifacts with package pack job. +# This job should be removed when issue will be resolved since it's not used anywhere +{% for project in projects.all -%} +{% for platform in test_platforms.desktop -%} +project_pack_-_{{ project.name }}_{{ platform.name }}: + name: Project Pack - {{ project.name }} [{{ platform.name }}] + agent: + type: {{ platform.type }} + image: {{ platform.image }} + flavor: {{ platform.flavor }} +commands: + - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm # upm-ci is not preinstalled on the image so we need to download it + - upm-ci project pack --project-path {{ project.path }} +artifacts: + packages: + paths: + - "upm-ci~/packages/**/*" +{% endfor -%} +{% endfor -%} \ No newline at end of file From c596c63155332ec539b316dd9b65f4bd4d230c32 Mon Sep 17 00:00:00 2001 From: michal-chrobot Date: Thu, 30 Oct 2025 13:18:41 +0100 Subject: [PATCH 3/8] typo --- .yamato/project-updated-dependencies-test.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.yamato/project-updated-dependencies-test.yml b/.yamato/project-updated-dependencies-test.yml index e8b51b9d32..d8b09ff3a0 100644 --- a/.yamato/project-updated-dependencies-test.yml +++ b/.yamato/project-updated-dependencies-test.yml @@ -58,12 +58,12 @@ project_pack_-_{{ project.name }}_{{ platform.name }}: type: {{ platform.type }} image: {{ platform.image }} flavor: {{ platform.flavor }} -commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm # upm-ci is not preinstalled on the image so we need to download it - - upm-ci project pack --project-path {{ project.path }} -artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" + commands: + - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm # upm-ci is not preinstalled on the image so we need to download it + - upm-ci project pack --project-path {{ project.path }} + artifacts: + packages: + paths: + - "upm-ci~/packages/**/*" {% endfor -%} {% endfor -%} \ No newline at end of file From d77ab1e7a6cd8549aa47aa11a933f60dbc6a7617 Mon Sep 17 00:00:00 2001 From: michal-chrobot Date: Thu, 30 Oct 2025 13:21:33 +0100 Subject: [PATCH 4/8] bom removed --- .pr_agent.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pr_agent.toml b/.pr_agent.toml index 44bc7046fa..49734d8c44 100644 --- a/.pr_agent.toml +++ b/.pr_agent.toml @@ -1,2 +1,2 @@ -[github_app] +[github_app] pr_commands = [] From bb797915acea374eed46eeee134a9777db69626b Mon Sep 17 00:00:00 2001 From: michal-chrobot Date: Thu, 30 Oct 2025 13:27:03 +0100 Subject: [PATCH 5/8] typo in project-tests --- .yamato/project-tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.yamato/project-tests.yml b/.yamato/project-tests.yml index e61ee790bc..1eb2e05e62 100644 --- a/.yamato/project-tests.yml +++ b/.yamato/project-tests.yml @@ -46,7 +46,8 @@ test_{{ project.name }}_{{ platform.name }}_{{ editor }}: - "upm-ci~/test-results/**/*" dependencies: - .yamato/_run-all.yml#run_quick_checks # initial checks to perform fast validation of common errors - - .yamato/package-pack.yml#package_pack_-_ngo_{{ platform.name }}{% endfor -%} + - .yamato/package-pack.yml#package_pack_-_ngo_{{ platform.name }} {% endfor -%} {% endif -%} {% endfor -%} +{% endfor -%} From da8ad4c73a938e23ade6e8d4c1529c79ee9a2612 Mon Sep 17 00:00:00 2001 From: michal-chrobot Date: Thu, 30 Oct 2025 13:30:21 +0100 Subject: [PATCH 6/8] typo --- .yamato/project.metafile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/project.metafile b/.yamato/project.metafile index 47a2f8f3ce..81733a3303 100644 --- a/.yamato/project.metafile +++ b/.yamato/project.metafile @@ -59,7 +59,7 @@ test_platforms: - name: mac type: Unity::VM::osx image: package-ci/macos-13-arm64:v4 # ARM64 to support M1 model (below) - smaller_flavor: m1.mac # mac doesn't have a smaller vm size. We define it anyway as it simplifies the yaml templating to have it defined. + flavor: m1.mac # mac doesn't have a smaller vm size. We define it anyway as it simplifies the yaml templating to have it defined. smaller_flavor: b1.medium standalone: StandaloneOSX model: M1 # The default model (an x64 Intel Mac VM) quite often caused a known issue of doing all the bitflips in packages resulting in failures From 7f8b792a47f5543029ce1359720b22fca7f230d1 Mon Sep 17 00:00:00 2001 From: michal-chrobot Date: Thu, 30 Oct 2025 13:33:12 +0100 Subject: [PATCH 7/8] typo --- .yamato/project-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/project-tests.yml b/.yamato/project-tests.yml index 1eb2e05e62..6e30b487d7 100644 --- a/.yamato/project-tests.yml +++ b/.yamato/project-tests.yml @@ -48,6 +48,6 @@ test_{{ project.name }}_{{ platform.name }}_{{ editor }}: - .yamato/_run-all.yml#run_quick_checks # initial checks to perform fast validation of common errors - .yamato/package-pack.yml#package_pack_-_ngo_{{ platform.name }} {% endfor -%} -{% endif -%} {% endfor -%} +{% endif -%} {% endfor -%} From 92a6e56b30ddce6daf476dcc19dc5f15ffe9405e Mon Sep 17 00:00:00 2001 From: michal-chrobot Date: Thu, 30 Oct 2025 13:35:05 +0100 Subject: [PATCH 8/8] dependency correction --- .yamato/desktop-standalone-tests.yml | 2 +- .yamato/project-tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/desktop-standalone-tests.yml b/.yamato/desktop-standalone-tests.yml index 7f26534cf6..6114fbff59 100644 --- a/.yamato/desktop-standalone-tests.yml +++ b/.yamato/desktop-standalone-tests.yml @@ -54,7 +54,7 @@ desktop_standalone_build_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ - "artifacts/**/*" dependencies: - .yamato/_run-all.yml#run_quick_checks # initial checks to perform fast validation of common errors - - .yamato/package-pack.yml#package_pack_-_ngo_{{ platform.name }} + - .yamato/package-pack.yml#package_pack_-_ngo_ubuntu {% endfor -%} {% endfor -%} {% endfor -%} diff --git a/.yamato/project-tests.yml b/.yamato/project-tests.yml index 6e30b487d7..49b4d1467a 100644 --- a/.yamato/project-tests.yml +++ b/.yamato/project-tests.yml @@ -46,7 +46,7 @@ test_{{ project.name }}_{{ platform.name }}_{{ editor }}: - "upm-ci~/test-results/**/*" dependencies: - .yamato/_run-all.yml#run_quick_checks # initial checks to perform fast validation of common errors - - .yamato/package-pack.yml#package_pack_-_ngo_{{ platform.name }} + - .yamato/package-pack.yml#package_pack_-_ngo_ubuntu {% endfor -%} {% endfor -%} {% endif -%}