diff --git a/.yamato/_abv.yml b/.yamato/_abv.yml index 86285391c62..271ae738c18 100644 --- a/.yamato/_abv.yml +++ b/.yamato/_abv.yml @@ -2,16 +2,13 @@ # This file is generated by ant_yaml_generation package, don't edit this file manually. # Introduce any changes under .yamato/config/*.metafile files and rerun yaml-generation (or check #devs-automation-tooling). -{% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2022.3.metafile -%} --- graphics_repo_nightly_2022.3: name: Pack & Test all templates on 2022.3 variables: - CACHE_ARGS: '{{cache.flags}}' - CUSTOM_REVISION: '{{2022_3.changeset.id}}' + CUSTOM_REVISION: '2022.3' TEST_FILTER: .* UTR_VERSION: "current" triggers: @@ -21,13 +18,3 @@ graphics_repo_nightly_2022.3: dependencies: - path: .yamato/_templates.yml#all_template_ci_2022.3 rerun: on_new_revision -graphics_repo_nightly_CUSTOM-REVISION: - name: Pack & Test all templates on CUSTOM-REVISION - variables: - CACHE_ARGS: '{{cache.flags}}' - CUSTOM_REVISION: custom_revision_not_set - TEST_FILTER: .* - UTR_VERSION: "current" - dependencies: - - path: .yamato/_templates.yml#all_template_ci_CUSTOM-REVISION - rerun: on_new_revision diff --git a/.yamato/_cache_config.metafile b/.yamato/_cache_config.metafile deleted file mode 100644 index 69e2e6cc8bd..00000000000 --- a/.yamato/_cache_config.metafile +++ /dev/null @@ -1,2 +0,0 @@ -cache: - flags: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP_2022.3" --extra-editor-arg="-adb2" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerWaitForUploadCompletion" diff --git a/.yamato/_editor_pinning.yml b/.yamato/_editor_pinning.yml deleted file mode 100644 index fdf87a26c83..00000000000 --- a/.yamato/_editor_pinning.yml +++ /dev/null @@ -1,35 +0,0 @@ - -# This file is generated by ant_yaml_generation package, don't edit this file manually. -# Introduce any changes under .yamato/config/*.metafile files and rerun yaml-generation (or check #devs-automation-tooling). - -{% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2022.3.metafile -%} - ---- - -editor-pinning-update: - name: Update pinned editor versions - agent: - type: Unity::VM - image: package-ci/ubuntu:v2.0.0-947723 - flavor: b1.small - variables: - CI: true - commands: - - pip3 config set global.index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple - - pip3 install ruamel.yaml - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install unity-downloader-cli - - git config --global user.name "noreply@unity3d.com" - - git config --global user.email "noreply@unity3d.com" - - git checkout $GIT_BRANCH - - git clone git@github.cds.internal.unity3d.com:unity/gfx-sdet-tools.git - - cd gfx-sdet-tools && git rev-parse HEAD - - python3 gfx-sdet-tools/scripts/update_revisions.py --track 2022.3 --unity-branch 2022.3/staging --api-key $CDS_GITHUB_SERVICE_TOKEN --commit-and-push --nr-commits-to-retrieve 1 --vcs git - triggers: - recurring: - - branch: 2022.3/staging - frequency: 21 ? * 7 # At 9pm every Saturday - must happen before the ABV (abv.metafile). 2hrs before is arbitrary diff --git a/.yamato/_editor_priming.yml b/.yamato/_editor_priming.yml index b8dc7db9efc..32b4ce6a643 100644 --- a/.yamato/_editor_priming.yml +++ b/.yamato/_editor_priming.yml @@ -2,8 +2,6 @@ # This file is generated by ant_yaml_generation package, don't edit this file manually. # Introduce any changes under .yamato/config/*.metafile files and rerun yaml-generation (or check #devs-automation-tooling). -{% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2022.3.metafile -%} --- @@ -11,34 +9,11 @@ editor:priming:2022.3:Win: name: '[2022.3,Win] Editor priming' agent: type: Unity::VM - image: package-ci/ubuntu:v2.0.0-947723 + image: package-ci/ubuntu-22.04:v4 flavor: b1.small skip_checkout: true variables: - CUSTOM_REVISION: '{{2022_3.changeset.id}}' - DISPLAY: ":0" - PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - commands: - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install unity-downloader-cli - - unity-downloader-cli -u $CUSTOM_REVISION -o windows --wait --skip-download -c editor -c il2cpp > unity_revision.txt - artifacts: - revisions: - paths: - - "unity_revision.txt" -editor:priming:CUSTOM-REVISION:Win: - name: '[CUSTOM-REVISION,Win] Editor priming' - agent: - type: Unity::VM - image: package-ci/ubuntu:v2.0.0-947723 - flavor: b1.small - skip_checkout: true - variables: - CUSTOM_REVISION: custom_revision_not_set + CUSTOM_REVISION: '2022.3' DISPLAY: ":0" PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates @@ -57,7 +32,7 @@ editor:priming:test_min_editor:Win: name: '[Min_Editor,Win] Editor priming' agent: type: Unity::VM - image: package-ci/ubuntu:v2.0.0-947723 + image: package-ci/ubuntu-22.04:v4 flavor: b1.small variables: DISPLAY: ":0" @@ -80,34 +55,11 @@ editor:priming:2022.3:OSX: name: '[2022.3,OSX] Editor priming' agent: type: Unity::VM - image: package-ci/ubuntu:v2.0.0-947723 - flavor: b1.small - skip_checkout: true - variables: - CUSTOM_REVISION: '{{2022_3.changeset.id}}' - DISPLAY: ":0" - PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - commands: - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install unity-downloader-cli - - unity-downloader-cli -u $CUSTOM_REVISION -o macos --wait --skip-download -c editor -c il2cpp > unity_revision.txt - artifacts: - revisions: - paths: - - "unity_revision.txt" -editor:priming:CUSTOM-REVISION:OSX: - name: '[CUSTOM-REVISION,OSX] Editor priming' - agent: - type: Unity::VM - image: package-ci/ubuntu:v2.0.0-947723 + image: package-ci/ubuntu-22.04:v4 flavor: b1.small skip_checkout: true variables: - CUSTOM_REVISION: custom_revision_not_set + CUSTOM_REVISION: '2022.3' DISPLAY: ":0" PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates @@ -126,7 +78,7 @@ editor:priming:test_min_editor:OSX: name: '[Min_Editor,OSX] Editor priming' agent: type: Unity::VM - image: package-ci/ubuntu:v2.0.0-947723 + image: package-ci/ubuntu-22.04:v4 flavor: b1.small variables: DISPLAY: ":0" @@ -149,34 +101,11 @@ editor:priming:2022.3:OSX_Apple_Silicon: name: '[2022.3,OSX_Apple_Silicon] Editor priming' agent: type: Unity::VM - image: package-ci/ubuntu:v2.0.0-947723 + image: package-ci/ubuntu-22.04:v4 flavor: b1.small skip_checkout: true variables: - CUSTOM_REVISION: '{{2022_3.changeset.id}}' - DISPLAY: ":0" - PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - commands: - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install unity-downloader-cli - - unity-downloader-cli -u $CUSTOM_REVISION -o macos --wait --skip-download -c editor -c il2cpp > unity_revision.txt - artifacts: - revisions: - paths: - - "unity_revision.txt" -editor:priming:CUSTOM-REVISION:OSX_Apple_Silicon: - name: '[CUSTOM-REVISION,OSX_Apple_Silicon] Editor priming' - agent: - type: Unity::VM - image: package-ci/ubuntu:v2.0.0-947723 - flavor: b1.small - skip_checkout: true - variables: - CUSTOM_REVISION: custom_revision_not_set + CUSTOM_REVISION: '2022.3' DISPLAY: ":0" PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates @@ -195,7 +124,7 @@ editor:priming:test_min_editor:OSX_Apple_Silicon: name: '[Min_Editor,OSX_Apple_Silicon] Editor priming' agent: type: Unity::VM - image: package-ci/ubuntu:v2.0.0-947723 + image: package-ci/ubuntu-22.04:v4 flavor: b1.small variables: DISPLAY: ":0" @@ -218,34 +147,11 @@ editor:priming:2022.3:Linux: name: '[2022.3,Linux] Editor priming' agent: type: Unity::VM - image: package-ci/ubuntu:v2.0.0-947723 - flavor: b1.small - skip_checkout: true - variables: - CUSTOM_REVISION: '{{2022_3.changeset.id}}' - DISPLAY: ":0" - PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - commands: - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install unity-downloader-cli - - unity-downloader-cli -u $CUSTOM_REVISION -o linux --wait --skip-download -c editor -c il2cpp > unity_revision.txt - artifacts: - revisions: - paths: - - "unity_revision.txt" -editor:priming:CUSTOM-REVISION:Linux: - name: '[CUSTOM-REVISION,Linux] Editor priming' - agent: - type: Unity::VM - image: package-ci/ubuntu:v2.0.0-947723 + image: package-ci/ubuntu-22.04:v4 flavor: b1.small skip_checkout: true variables: - CUSTOM_REVISION: custom_revision_not_set + CUSTOM_REVISION: '2022.3' DISPLAY: ":0" PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates @@ -264,7 +170,7 @@ editor:priming:test_min_editor:Linux: name: '[Min_Editor,Linux] Editor priming' agent: type: Unity::VM - image: package-ci/ubuntu:v2.0.0-947723 + image: package-ci/ubuntu-22.04:v4 flavor: b1.small variables: DISPLAY: ":0" diff --git a/.yamato/_formatting.yml b/.yamato/_formatting.yml deleted file mode 100644 index fd4f73093c6..00000000000 --- a/.yamato/_formatting.yml +++ /dev/null @@ -1,42 +0,0 @@ -# Documentation: https://internaldocs.hq.unity3d.com/unity-meta/ - -formatting: - name: Formatting - agent: - type: Unity::VM - image: package-ci/ubuntu:v1.3.1-719011 - flavor: b1.small - commands: - - "echo -e \"[extensions]\nlargefiles=\n\" > ~/.hgrc" - - hg clone -u beta http://hg-mirror-slo.hq.unity3d.com/unity-extra/unity-meta ~/unity-meta - - perl ~/unity-meta/Tools/Format/format.pl --nobackups . - - git diff --output ./format.patch - - cat ./format.patch - - | # Checking if there is a diff, to fail the job if yes (-s check means does the file contain something) - if [ -s format.patch ]; then exit 1; fi - timeout: 1 - # triggers: - # expression: pull_request.target eq "master" - artifacts: - diff: - paths: - - format.patch - -formatting_apply: - name: Formatting (Apply requested changes) - agent: - type: Unity::VM - image: package-ci/ubuntu:v1.3.1-719011 - flavor: b1.small - commands: - - git config --global user.name "noreply@unity3d.com" - - git config --global user.email "noreply@unity3d.com" - - git checkout $GIT_BRANCH - - git pull origin $GIT_BRANCH # In case the job was not run on the latest commit, attempt to get it. There may be situations with merge conflicts, in that case wait for everyone to push their changes and then only run the formatting job on HEAD. - - "echo -e \"[extensions]\nlargefiles=\n\" > ~/.hgrc" - - hg clone -u beta http://hg-mirror-slo.hq.unity3d.com/unity-extra/unity-meta ~/unity-meta - - perl ~/unity-meta/Tools/Format/format.pl --nobackups . - - git add . - - git commit -m "Apply formatting changes" - - git push --set-upstream origin $GIT_BRANCH - timeout: 1 diff --git a/.yamato/_latest_editor_versions_2022.3.metafile b/.yamato/_latest_editor_versions_2022.3.metafile deleted file mode 100644 index 50e67ebd7d3..00000000000 --- a/.yamato/_latest_editor_versions_2022.3.metafile +++ /dev/null @@ -1,5 +0,0 @@ -'2022_3': - updated_at_UTC: '2024-08-17 21:35:45.493653' - changeset: - id: 3fea9237d581a5de5feb42b6b9704b0f5c93de63 - date: '2024-08-15T16:36:25Z' diff --git a/.yamato/_templates.yml b/.yamato/_templates.yml index 36f5b40f8ae..4c27f74d060 100644 --- a/.yamato/_templates.yml +++ b/.yamato/_templates.yml @@ -2,8 +2,6 @@ # This file is generated by ant_yaml_generation package, don't edit this file manually. # Introduce any changes under .yamato/config/*.metafile files and rerun yaml-generation (or check #devs-automation-tooling). -{% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2022.3.metafile -%} --- @@ -11,7 +9,7 @@ pre_pack_hdrp_template_Win_2022.3: name: Pre-Pack HDRP Template Win 2022.3 agent: type: Unity::VM - image: package-ci/win10:stable + image: package-ci/win11:v4 flavor: b1.large commands: - choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local @@ -32,7 +30,7 @@ pack_hdrp_template_Win_2022.3: name: Pack HDRP Template Win 2022.3 agent: type: Unity::VM - image: package-ci/win10:v2.2.1-1064078 + image: package-ci/win10:v4 flavor: b1.large commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm @@ -46,7 +44,7 @@ test_hdrp_template_Win_2022.3: name: Test HDRP Template Win 2022.3 agent: type: Unity::VM - image: package-ci/win10:stable + image: package-ci/win11:v4 flavor: b1.large dependencies: - .yamato/_templates.yml#pack_hdrp_template_Win_2022.3 @@ -64,7 +62,7 @@ pre_pack_hdrp_template_OSX_2022.3: name: Pre-Pack HDRP Template OSX 2022.3 agent: type: Unity::VM::osx - image: package-ci/mac:stable + image: package-ci/macos-13:v4 flavor: m1.mac commands: - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only @@ -84,7 +82,7 @@ pack_hdrp_template_OSX_2022.3: name: Pack HDRP Template OSX 2022.3 agent: type: Unity::VM - image: package-ci/win10:v2.2.1-1064078 + image: package-ci/win10:v4 flavor: b1.large commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm @@ -98,7 +96,7 @@ test_hdrp_template_OSX_2022.3: name: Test HDRP Template OSX 2022.3 agent: type: Unity::VM::osx - image: package-ci/mac:stable + image: package-ci/macos-13:v4 flavor: m1.mac dependencies: - .yamato/_templates.yml#pack_hdrp_template_OSX_2022.3 @@ -114,7 +112,7 @@ test_hdrp_template_OSX_2022.3: publish_hdrp_template_2022.3: agent: type: Unity::VM - image: package-ci/win10:v2.2.1-1064078 + image: package-ci/win10:v4 flavor: b1.large name: Publish HDRP Template 2022.3 commands: @@ -133,7 +131,7 @@ publish_hdrp_template_2022.3: publish_hdrp_template_2022.3_dry_run: agent: type: Unity::VM - image: package-ci/win10:v2.2.1-1064078 + image: package-ci/win10:v4 flavor: b1.large name: Publish HDRP Template 2022.3 Dry Run commands: @@ -149,161 +147,11 @@ publish_hdrp_template_2022.3_dry_run: paths: - "upm-ci~/packages/**/*" - "upm-ci~/templates/**/*" -pre_pack_hdrp_template_Win_CUSTOM-REVISION: - name: Pre-Pack HDRP Template Win CUSTOM-REVISION - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - commands: - - choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - .Editor\Unity.exe -projectPath com.unity.template-hd -batchmode -quit -logFile ./Editor.log - dependencies: - - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Win - artifacts: - primed: - paths: - - "com.unity.template-hd/Library/Artifacts/**" - - "com.unity.template-hd/Library/ArtifactDB" - - "com.unity.template-hd/Library/SourceAssetDB" - logs: - paths: - - "Editor.log" -pack_hdrp_template_Win_CUSTOM-REVISION: - name: Pack HDRP Template Win CUSTOM-REVISION - agent: - type: Unity::VM - image: package-ci/win10:v2.2.1-1064078 - flavor: b1.large - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci template pack --project-path com.unity.template-hd - artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" - - "upm-ci~/templates/**/*" -test_hdrp_template_Win_CUSTOM-REVISION: - name: Test HDRP Template Win CUSTOM-REVISION - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - dependencies: - - .yamato/_templates.yml#pack_hdrp_template_Win_CUSTOM-REVISION - - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Win - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - upm-ci template test -u .\.Editor --project-path com.unity.template-hd - artifacts: - logs: - paths: - - "**/test-results/**" - variables: - CUSTOM_REVISION: custom_revision_not_set -pre_pack_hdrp_template_OSX_CUSTOM-REVISION: - name: Pre-Pack HDRP Template OSX CUSTOM-REVISION - agent: - type: Unity::VM::osx - image: package-ci/mac:stable - flavor: m1.mac - commands: - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-hd -batchmode -quit -logFile ./Editor.log - dependencies: - - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:OSX - artifacts: - primed: - paths: - - "com.unity.template-hd/Library/Artifacts/**" - - "com.unity.template-hd/Library/ArtifactDB" - - "com.unity.template-hd/Library/SourceAssetDB" - logs: - paths: - - "Editor.log" -pack_hdrp_template_OSX_CUSTOM-REVISION: - name: Pack HDRP Template OSX CUSTOM-REVISION - agent: - type: Unity::VM - image: package-ci/win10:v2.2.1-1064078 - flavor: b1.large - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci template pack --project-path com.unity.template-hd - artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" - - "upm-ci~/templates/**/*" -test_hdrp_template_OSX_CUSTOM-REVISION: - name: Test HDRP Template OSX CUSTOM-REVISION - agent: - type: Unity::VM::osx - image: package-ci/mac:stable - flavor: m1.mac - dependencies: - - .yamato/_templates.yml#pack_hdrp_template_OSX_CUSTOM-REVISION - - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:OSX - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path com.unity.template-hd - artifacts: - logs: - paths: - - "**/test-results/**" - variables: - CUSTOM_REVISION: custom_revision_not_set -publish_hdrp_template_CUSTOM-REVISION: - agent: - type: Unity::VM - image: package-ci/win10:v2.2.1-1064078 - flavor: b1.large - name: Publish HDRP Template CUSTOM-REVISION - variables: - CUSTOM_REVISION: custom_revision_not_set - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci template publish --project-path com.unity.template-hd - dependencies: - - .yamato/_templates.yml#test_hdrp_template_Win_CUSTOM-REVISION - - .yamato/_templates.yml#test_hdrp_template_OSX_CUSTOM-REVISION - - .yamato/_templates.yml#pack_hdrp_template_Win_CUSTOM-REVISION - - .yamato/_templates.yml#pack_hdrp_template_OSX_CUSTOM-REVISION - artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" - - "upm-ci~/templates/**/*" -publish_hdrp_template_CUSTOM-REVISION_dry_run: - agent: - type: Unity::VM - image: package-ci/win10:v2.2.1-1064078 - flavor: b1.large - name: Publish HDRP Template CUSTOM-REVISION Dry Run - variables: - CUSTOM_REVISION: custom_revision_not_set - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci template publish --project-path com.unity.template-hd --dry-run - dependencies: - - .yamato/_templates.yml#test_hdrp_template_Win_CUSTOM-REVISION - - .yamato/_templates.yml#test_hdrp_template_OSX_CUSTOM-REVISION - - .yamato/_templates.yml#pack_hdrp_template_Win_CUSTOM-REVISION - - .yamato/_templates.yml#pack_hdrp_template_OSX_CUSTOM-REVISION - artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" - - "upm-ci~/templates/**/*" pre_pack_hdrp_blank_template_Win_2022.3: name: Pre-Pack HDRP Blank Template Win 2022.3 agent: type: Unity::VM - image: package-ci/win10:stable + image: package-ci/win11:v4 flavor: b1.large commands: - choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local @@ -324,7 +172,7 @@ pack_hdrp_blank_template_Win_2022.3: name: Pack HDRP Blank Template Win 2022.3 agent: type: Unity::VM - image: package-ci/win10:v2.2.1-1064078 + image: package-ci/win10:v4 flavor: b1.large commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm @@ -338,7 +186,7 @@ test_hdrp_blank_template_Win_2022.3: name: Test HDRP Blank Template Win 2022.3 agent: type: Unity::VM - image: package-ci/win10:stable + image: package-ci/win11:v4 flavor: b1.large dependencies: - .yamato/_templates.yml#pack_hdrp_blank_template_Win_2022.3 @@ -356,7 +204,7 @@ pre_pack_hdrp_blank_template_OSX_2022.3: name: Pre-Pack HDRP Blank Template OSX 2022.3 agent: type: Unity::VM::osx - image: package-ci/mac:stable + image: package-ci/macos-13:v4 flavor: m1.mac commands: - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only @@ -376,7 +224,7 @@ pack_hdrp_blank_template_OSX_2022.3: name: Pack HDRP Blank Template OSX 2022.3 agent: type: Unity::VM - image: package-ci/win10:v2.2.1-1064078 + image: package-ci/win10:v4 flavor: b1.large commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm @@ -390,7 +238,7 @@ test_hdrp_blank_template_OSX_2022.3: name: Test HDRP Blank Template OSX 2022.3 agent: type: Unity::VM::osx - image: package-ci/mac:stable + image: package-ci/macos-13:v4 flavor: m1.mac dependencies: - .yamato/_templates.yml#pack_hdrp_blank_template_OSX_2022.3 @@ -406,7 +254,7 @@ test_hdrp_blank_template_OSX_2022.3: publish_hdrp_blank_template_2022.3: agent: type: Unity::VM - image: package-ci/win10:v2.2.1-1064078 + image: package-ci/win10:v4 flavor: b1.large name: Publish HDRP Blank Template 2022.3 commands: @@ -425,7 +273,7 @@ publish_hdrp_blank_template_2022.3: publish_hdrp_blank_template_2022.3_dry_run: agent: type: Unity::VM - image: package-ci/win10:v2.2.1-1064078 + image: package-ci/win10:v4 flavor: b1.large name: Publish HDRP Blank Template 2022.3 Dry Run commands: @@ -441,161 +289,11 @@ publish_hdrp_blank_template_2022.3_dry_run: paths: - "upm-ci~/packages/**/*" - "upm-ci~/templates/**/*" -pre_pack_hdrp_blank_template_Win_CUSTOM-REVISION: - name: Pre-Pack HDRP Blank Template Win CUSTOM-REVISION - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - commands: - - choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - .Editor\Unity.exe -projectPath com.unity.template.hdrp-blank -batchmode -quit -logFile ./Editor.log - dependencies: - - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Win - artifacts: - primed: - paths: - - "com.unity.template.hdrp-blank/Library/Artifacts/**" - - "com.unity.template.hdrp-blank/Library/ArtifactDB" - - "com.unity.template.hdrp-blank/Library/SourceAssetDB" - logs: - paths: - - "Editor.log" -pack_hdrp_blank_template_Win_CUSTOM-REVISION: - name: Pack HDRP Blank Template Win CUSTOM-REVISION - agent: - type: Unity::VM - image: package-ci/win10:v2.2.1-1064078 - flavor: b1.large - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci template pack --project-path com.unity.template.hdrp-blank - artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" - - "upm-ci~/templates/**/*" -test_hdrp_blank_template_Win_CUSTOM-REVISION: - name: Test HDRP Blank Template Win CUSTOM-REVISION - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - dependencies: - - .yamato/_templates.yml#pack_hdrp_blank_template_Win_CUSTOM-REVISION - - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Win - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - upm-ci template test -u .\.Editor --project-path com.unity.template.hdrp-blank - artifacts: - logs: - paths: - - "**/test-results/**" - variables: - CUSTOM_REVISION: custom_revision_not_set -pre_pack_hdrp_blank_template_OSX_CUSTOM-REVISION: - name: Pre-Pack HDRP Blank Template OSX CUSTOM-REVISION - agent: - type: Unity::VM::osx - image: package-ci/mac:stable - flavor: m1.mac - commands: - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template.hdrp-blank -batchmode -quit -logFile ./Editor.log - dependencies: - - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:OSX - artifacts: - primed: - paths: - - "com.unity.template.hdrp-blank/Library/Artifacts/**" - - "com.unity.template.hdrp-blank/Library/ArtifactDB" - - "com.unity.template.hdrp-blank/Library/SourceAssetDB" - logs: - paths: - - "Editor.log" -pack_hdrp_blank_template_OSX_CUSTOM-REVISION: - name: Pack HDRP Blank Template OSX CUSTOM-REVISION - agent: - type: Unity::VM - image: package-ci/win10:v2.2.1-1064078 - flavor: b1.large - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci template pack --project-path com.unity.template.hdrp-blank - artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" - - "upm-ci~/templates/**/*" -test_hdrp_blank_template_OSX_CUSTOM-REVISION: - name: Test HDRP Blank Template OSX CUSTOM-REVISION - agent: - type: Unity::VM::osx - image: package-ci/mac:stable - flavor: m1.mac - dependencies: - - .yamato/_templates.yml#pack_hdrp_blank_template_OSX_CUSTOM-REVISION - - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:OSX - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path com.unity.template.hdrp-blank - artifacts: - logs: - paths: - - "**/test-results/**" - variables: - CUSTOM_REVISION: custom_revision_not_set -publish_hdrp_blank_template_CUSTOM-REVISION: - agent: - type: Unity::VM - image: package-ci/win10:v2.2.1-1064078 - flavor: b1.large - name: Publish HDRP Blank Template CUSTOM-REVISION - variables: - CUSTOM_REVISION: custom_revision_not_set - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci template publish --project-path com.unity.template.hdrp-blank - dependencies: - - .yamato/_templates.yml#test_hdrp_blank_template_Win_CUSTOM-REVISION - - .yamato/_templates.yml#test_hdrp_blank_template_OSX_CUSTOM-REVISION - - .yamato/_templates.yml#pack_hdrp_blank_template_Win_CUSTOM-REVISION - - .yamato/_templates.yml#pack_hdrp_blank_template_OSX_CUSTOM-REVISION - artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" - - "upm-ci~/templates/**/*" -publish_hdrp_blank_template_CUSTOM-REVISION_dry_run: - agent: - type: Unity::VM - image: package-ci/win10:v2.2.1-1064078 - flavor: b1.large - name: Publish HDRP Blank Template CUSTOM-REVISION Dry Run - variables: - CUSTOM_REVISION: custom_revision_not_set - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci template publish --project-path com.unity.template.hdrp-blank --dry-run - dependencies: - - .yamato/_templates.yml#test_hdrp_blank_template_Win_CUSTOM-REVISION - - .yamato/_templates.yml#test_hdrp_blank_template_OSX_CUSTOM-REVISION - - .yamato/_templates.yml#pack_hdrp_blank_template_Win_CUSTOM-REVISION - - .yamato/_templates.yml#pack_hdrp_blank_template_OSX_CUSTOM-REVISION - artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" - - "upm-ci~/templates/**/*" pre_pack_universal_template_Win_2022.3: name: Pre-Pack Universal Template Win 2022.3 agent: type: Unity::VM - image: package-ci/win10:stable + image: package-ci/win11:v4 flavor: b1.large commands: - choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local @@ -616,7 +314,7 @@ pack_universal_template_Win_2022.3: name: Pack Universal Template Win 2022.3 agent: type: Unity::VM - image: package-ci/win10:v2.2.1-1064078 + image: package-ci/win10:v4 flavor: b1.large commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm @@ -630,7 +328,7 @@ test_universal_template_Win_2022.3: name: Test Universal Template Win 2022.3 agent: type: Unity::VM - image: package-ci/win10:stable + image: package-ci/win11:v4 flavor: b1.large dependencies: - .yamato/_templates.yml#pack_universal_template_Win_2022.3 @@ -648,7 +346,7 @@ pre_pack_universal_template_OSX_2022.3: name: Pre-Pack Universal Template OSX 2022.3 agent: type: Unity::VM::osx - image: package-ci/mac:stable + image: package-ci/macos-13:v4 flavor: m1.mac commands: - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only @@ -668,7 +366,7 @@ pack_universal_template_OSX_2022.3: name: Pack Universal Template OSX 2022.3 agent: type: Unity::VM - image: package-ci/win10:v2.2.1-1064078 + image: package-ci/win10:v4 flavor: b1.large commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm @@ -682,7 +380,7 @@ test_universal_template_OSX_2022.3: name: Test Universal Template OSX 2022.3 agent: type: Unity::VM::osx - image: package-ci/mac:stable + image: package-ci/macos-13:v4 flavor: m1.mac dependencies: - .yamato/_templates.yml#pack_universal_template_OSX_2022.3 @@ -698,7 +396,7 @@ test_universal_template_OSX_2022.3: publish_universal_template_2022.3: agent: type: Unity::VM - image: package-ci/win10:v2.2.1-1064078 + image: package-ci/win10:v4 flavor: b1.large name: Publish Universal Template 2022.3 commands: @@ -717,7 +415,7 @@ publish_universal_template_2022.3: publish_universal_template_2022.3_dry_run: agent: type: Unity::VM - image: package-ci/win10:v2.2.1-1064078 + image: package-ci/win10:v4 flavor: b1.large name: Publish Universal Template 2022.3 Dry Run commands: @@ -733,161 +431,11 @@ publish_universal_template_2022.3_dry_run: paths: - "upm-ci~/packages/**/*" - "upm-ci~/templates/**/*" -pre_pack_universal_template_Win_CUSTOM-REVISION: - name: Pre-Pack Universal Template Win CUSTOM-REVISION - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - commands: - - choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - .Editor\Unity.exe -projectPath com.unity.template-universal -batchmode -quit -logFile ./Editor.log - dependencies: - - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Win - artifacts: - primed: - paths: - - "com.unity.template-universal/Library/Artifacts/**" - - "com.unity.template-universal/Library/ArtifactDB" - - "com.unity.template-universal/Library/SourceAssetDB" - logs: - paths: - - "Editor.log" -pack_universal_template_Win_CUSTOM-REVISION: - name: Pack Universal Template Win CUSTOM-REVISION - agent: - type: Unity::VM - image: package-ci/win10:v2.2.1-1064078 - flavor: b1.large - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci template pack --project-path com.unity.template-universal - artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" - - "upm-ci~/templates/**/*" -test_universal_template_Win_CUSTOM-REVISION: - name: Test Universal Template Win CUSTOM-REVISION - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - dependencies: - - .yamato/_templates.yml#pack_universal_template_Win_CUSTOM-REVISION - - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Win - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - upm-ci template test -u .\.Editor --project-path com.unity.template-universal - artifacts: - logs: - paths: - - "**/test-results/**" - variables: - CUSTOM_REVISION: custom_revision_not_set -pre_pack_universal_template_OSX_CUSTOM-REVISION: - name: Pre-Pack Universal Template OSX CUSTOM-REVISION - agent: - type: Unity::VM::osx - image: package-ci/mac:stable - flavor: m1.mac - commands: - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-universal -batchmode -quit -logFile ./Editor.log - dependencies: - - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:OSX - artifacts: - primed: - paths: - - "com.unity.template-universal/Library/Artifacts/**" - - "com.unity.template-universal/Library/ArtifactDB" - - "com.unity.template-universal/Library/SourceAssetDB" - logs: - paths: - - "Editor.log" -pack_universal_template_OSX_CUSTOM-REVISION: - name: Pack Universal Template OSX CUSTOM-REVISION - agent: - type: Unity::VM - image: package-ci/win10:v2.2.1-1064078 - flavor: b1.large - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci template pack --project-path com.unity.template-universal - artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" - - "upm-ci~/templates/**/*" -test_universal_template_OSX_CUSTOM-REVISION: - name: Test Universal Template OSX CUSTOM-REVISION - agent: - type: Unity::VM::osx - image: package-ci/mac:stable - flavor: m1.mac - dependencies: - - .yamato/_templates.yml#pack_universal_template_OSX_CUSTOM-REVISION - - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:OSX - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path com.unity.template-universal - artifacts: - logs: - paths: - - "**/test-results/**" - variables: - CUSTOM_REVISION: custom_revision_not_set -publish_universal_template_CUSTOM-REVISION: - agent: - type: Unity::VM - image: package-ci/win10:v2.2.1-1064078 - flavor: b1.large - name: Publish Universal Template CUSTOM-REVISION - variables: - CUSTOM_REVISION: custom_revision_not_set - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci template publish --project-path com.unity.template-universal - dependencies: - - .yamato/_templates.yml#test_universal_template_Win_CUSTOM-REVISION - - .yamato/_templates.yml#test_universal_template_OSX_CUSTOM-REVISION - - .yamato/_templates.yml#pack_universal_template_Win_CUSTOM-REVISION - - .yamato/_templates.yml#pack_universal_template_OSX_CUSTOM-REVISION - artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" - - "upm-ci~/templates/**/*" -publish_universal_template_CUSTOM-REVISION_dry_run: - agent: - type: Unity::VM - image: package-ci/win10:v2.2.1-1064078 - flavor: b1.large - name: Publish Universal Template CUSTOM-REVISION Dry Run - variables: - CUSTOM_REVISION: custom_revision_not_set - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci template publish --project-path com.unity.template-universal --dry-run - dependencies: - - .yamato/_templates.yml#test_universal_template_Win_CUSTOM-REVISION - - .yamato/_templates.yml#test_universal_template_OSX_CUSTOM-REVISION - - .yamato/_templates.yml#pack_universal_template_Win_CUSTOM-REVISION - - .yamato/_templates.yml#pack_universal_template_OSX_CUSTOM-REVISION - artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" - - "upm-ci~/templates/**/*" all_template_ci_2022.3: name: Pack and test all templates - 2022.3 agent: type: Unity::VM - image: package-ci/win10:v2.2.1-1064078 + image: package-ci/win10:v4 flavor: b1.large dependencies: - .yamato/_templates.yml#test_hdrp_template_Win_2022.3 @@ -900,22 +448,3 @@ all_template_ci_2022.3: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci package izon -t - upm-ci package izon -d -all_template_ci_CUSTOM-REVISION: - name: Pack and test all templates - CUSTOM-REVISION - agent: - type: Unity::VM - image: package-ci/win10:v2.2.1-1064078 - flavor: b1.large - dependencies: - - .yamato/_templates.yml#test_hdrp_template_Win_CUSTOM-REVISION - - .yamato/_templates.yml#test_hdrp_blank_template_Win_CUSTOM-REVISION - - .yamato/_templates.yml#test_universal_template_Win_CUSTOM-REVISION - - .yamato/_templates.yml#test_hdrp_template_OSX_CUSTOM-REVISION - - .yamato/_templates.yml#test_hdrp_blank_template_OSX_CUSTOM-REVISION - - .yamato/_templates.yml#test_universal_template_OSX_CUSTOM-REVISION - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci package izon -t - - upm-ci package izon -d - variables: - CUSTOM_REVISION: custom_revision_not_set diff --git a/.yamato/config/__shared.metafile b/.yamato/config/__shared.metafile index 8be902ab175..7f7639642d1 100644 --- a/.yamato/config/__shared.metafile +++ b/.yamato/config/__shared.metafile @@ -11,20 +11,11 @@ editors: # applied for all yml files rerun_strategy: on_new_revision ono_branch_var: ONO_BRANCH_TRUNK editor_pinning: - enabled: True + enabled: False nr_commits_to_retrieve: 1 allow_triggers: True variables: CACHE_ARGS: '{{cache.flags}}' - - track: CUSTOM-REVISION - name: CUSTOM-REVISION - rerun_strategy: on_new_revision - editor_pinning: - enabled: False - fast: False - allow_triggers: False - variables: - CACHE_ARGS: '{{cache.flags}}' build_configs: - name: il2cpp_apiNet2 scripting_backend: IL2CPP @@ -239,19 +230,19 @@ platforms: agents_project: default: type: Unity::VM::GPU - image: automation-tooling/win-10:v0.0.1-971269 + image: automation-tooling/win10-21H1:v2.2309361 flavor: b1.large standalone_build: type: Unity::VM - image: automation-tooling/win-10:v0.0.1-971268 + image: automation-tooling/win10-21H1:v2.2309361 flavor: b1.xlarge editmode: type: Unity::VM - image: automation-tooling/win-10:v0.0.1-971268 + image: automation-tooling/win10-21H1:v2.2309361 flavor: b1.large agent_package: type: Unity::VM - image: package-ci/win10:stable + image: package-ci/win11:v4 flavor: b1.large copycmd: copy upm-ci~\packages\*.tgz .Editor\Data\Resources\PackageManager\Editor editorpath: .\.Editor @@ -294,11 +285,11 @@ platforms: agents_project_Metal: default: type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable + image: automation-tooling/macos-11:v2.1987114 flavor: m1.mac agent_package: type: Unity::VM::osx - image: package-ci/mac:stable + image: package-ci/macos-13:v4 flavor: m1.mac copycmd: cp ./upm-ci~/packages/*.tgz ./.Editor/Unity.app/Contents/Resources/PackageManager/Editor editorpath: "$(pwd)/.Editor/Unity.app/Contents/MacOS/Unity" @@ -357,12 +348,12 @@ platforms: agents_project_Metal: default: type: Unity::metal::macmini - image: slough-ops/macos-11-base:stable + image: automation-tooling/macos-11:v2.1987114 model: M1 flavor: m1.mac agent_package: type: Unity::VM::osx - image: package-ci/mac:stable + image: macos-13-arm64:v4 flavor: m1.mac commands: [Metal]: @@ -397,15 +388,15 @@ platforms: agents_project: default: type: Unity::VM::GPU - image: package-ci/ubuntu:stable + image: desktop/ubuntu-20.04-desktop:v2.1348791 flavor: b1.large editmode: type: Unity::VM - image: package-ci/ubuntu:stable + image: desktop/ubuntu-20.04-desktop:v2.1348791 flavor: b1.large standalone_build: type: Unity::VM - image: package-ci/ubuntu:stable + image: desktop/ubuntu-20.04-desktop:v2.1348791 flavor: b1.xlarge commands: [Vulkan]: @@ -441,21 +432,21 @@ platforms: non_project_agents: package_ci_ubuntu_large: type: Unity::VM - image: package-ci/ubuntu:v2.0.0-947723 + image: package-ci/ubuntu-22.04:v4 flavor: b1.large package_ci_ubuntu_xlarge: type: Unity::VM - image: package-ci/ubuntu:v2.0.0-947723 + image: package-ci/ubuntu-22.04:v4 flavor: b1.xlarge package_ci_ubuntu_small: type: Unity::VM - image: package-ci/ubuntu:v2.0.0-947723 + image: package-ci/ubuntu-22.04:v4 flavor: b1.small package_ci_win_large: type: Unity::VM - image: package-ci/win10:v2.2.1-1064078 + image: package-ci/win10:v4 flavor: b1.large package_ci_mac: type: Unity::VM::osx - image: package-ci/mac:v1.18.4-test.1-1062904 + image: package-ci/macos-13:v4 flavor: m1.mac diff --git a/.yamato/config/_editor.metafile b/.yamato/config/_editor.metafile index 5da19ed9539..b57211ed049 100644 --- a/.yamato/config/_editor.metafile +++ b/.yamato/config/_editor.metafile @@ -3,9 +3,11 @@ editor_pin_agent: package_ci_ubuntu_small editor_priming_config: use_predefined_variables: True + variables: + CUSTOM_REVISION: "2022.3" agent: type: Unity::VM - image: package-ci/ubuntu:v2.0.0-947723 + image: package-ci/ubuntu-22.04:v4 flavor: b1.small skip_checkout: true commands: @@ -17,31 +19,3 @@ editor_priming_config: - unity-downloader-cli -u $CUSTOM_REVISION -o --wait --skip-download > unity_revision.txt add_artifacts: - artifacts.revisions.paths: "unity_revision.txt" - -# EDITOR PINNING - -editor_versions_file: .yamato/_latest_editor_versions_TRACK.metafile -editor_pinning_config: - agent: - type: Unity::VM - image: package-ci/ubuntu:v2.0.0-947723 - flavor: b1.small - use_predefined_variables: True - commands: - - pip3 config set global.index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple - - pip3 install ruamel.yaml - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install unity-downloader-cli - - git config --global user.name "noreply@unity3d.com" - - git config --global user.email "noreply@unity3d.com" - - git checkout $GIT_BRANCH - - git clone git@github.cds.internal.unity3d.com:unity/gfx-sdet-tools.git - - cd gfx-sdet-tools && git rev-parse HEAD - - python3 gfx-sdet-tools/scripts/update_revisions.py --track 2022.3 --unity-branch 2022.3/staging --api-key $CDS_GITHUB_SERVICE_TOKEN --commit-and-push --nr-commits-to-retrieve 1 --vcs git - triggers: - recurring: - - branch: 2022.3/staging - frequency: 21 ? * 7 # At 9pm every Saturday - must happen before the ABV (abv.metafile). 2hrs before is arbitrary diff --git a/.yamato/postprocessing_publish.yml b/.yamato/postprocessing_publish.yml deleted file mode 100644 index 826d26e26e6..00000000000 --- a/.yamato/postprocessing_publish.yml +++ /dev/null @@ -1,109 +0,0 @@ - -# From https://github.com/Unity-Technologies/PostProcessing/blob/v2/.yamato/upm-ci.yml - -name: postprocessing -test_editors: - - trunk - - 2021.3 - - 2020.3 - - 2019.4 -test_platforms: - - name: win - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - - name: mac - type: Unity::VM::osx - image: package-ci/mac:stable - flavor: m1.mac ---- -{{ name }}_pack: - name: {{ name }} - Pack - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci package pack --package-path com.unity.postprocessing - artifacts: - packages: - paths: - - "upm-ci~/**/*" - -{% for editor in test_editors %} -{% for platform in test_platforms %} -{{ name }}_test_{{ platform.name }}_{{ editor }}: - name : {{ name }} - Test {{ editor }} on {{ 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 package test --unity-version {{ editor }} --package-path com.unity.postprocessing --extra-utr-arg="--compilation-errors-as-warnings" - artifacts: - logs: - paths: - - "upm-ci~/test-results/**/*" - dependencies: - - .yamato/postprocessing_publish.yml#{{ name }}_pack -{% endfor %} -{% endfor %} - -{{ name }}_test_trigger: - name: {{ name }} - Tests Trigger - dependencies: - - .yamato/postprocessing_publish.yml#{{ name }}_pack - {% for editor in test_editors %} - {% for platform in test_platforms %} - - .yamato/postprocessing_publish.yml#{{ name }}_test_{{platform.name}}_{{editor}} - {% endfor %} - {% endfor %} - -{{ name }}_publish: - name: {{ name }} - Publish to Internal Registry - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - variables: - UPMCI_ENABLE_PACKAGE_SIGNING: 1 - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci package publish --package-path com.unity.postprocessing - artifacts: - artifacts: - paths: - - "upm-ci~/packages/*.tgz" - dependencies: - - .yamato/postprocessing_publish.yml#{{ name }}_pack - {% for editor in test_editors %} - {% for platform in test_platforms %} - - .yamato/postprocessing_publish.yml#{{ name }}_test_{{ platform.name }}_{{ editor }} - {% endfor %} - {% endfor %} - - -{{ name }}_publish_dry_run: - name: {{ name }} - Publish to Internal Registry [dry-run] - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - variables: - UPMCI_ENABLE_PACKAGE_SIGNING: 1 - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci package publish --dry-run --package-path com.unity.postprocessing - artifacts: - artifacts: - paths: - - "upm-ci~/packages/*.tgz" - dependencies: - - .yamato/postprocessing_publish.yml#{{ name }}_pack - {% for editor in test_editors %} - {% for platform in test_platforms %} - - .yamato/postprocessing_publish.yml#{{ name }}_test_{{ platform.name }}_{{ editor }} - {% endfor %} - {% endfor %}