Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NEW: option to manually choose arbitrary editor version for CI jobs #2098

Closed
wants to merge 13 commits into from
Closed

NEW: option to manually choose arbitrary editor version for CI jobs #2098

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5e9a324
Update upm-ci.yml
stefanunity Dec 20, 2024
c1b98db
Update upm-ci.yml
stefanunity Dec 20, 2024
a975031
Update upm-ci.yml
stefanunity Dec 20, 2024
d546da9
Update upm-ci.yml
stefanunity Dec 20, 2024
332079c
add for il2ccp download
stefanunity Dec 20, 2024
e385518
update other jobs for revision override
stefanunity Dec 20, 2024
9539dcd
add actual variable to jobs
stefanunity Dec 20, 2024
8ca49c3
add variable to All Tests
stefanunity Dec 20, 2024
4f5dfab
removing from All Tests
stefanunity Dec 20, 2024
2d7e82b
variable change for *nix
stefanunity Dec 20, 2024
d90ddb1
fix wrong logic
stefanunity Dec 21, 2024
4f34767
forgot one more !
stefanunity Dec 21, 2024
86337a2
Update upm-ci.yml
stefanunity Dec 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions .yamato/upm-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
type: {{ platform.type }}
image: {{ platform.image }}
flavor: {{ platform.flavor }}
variables:
EDITOR_REVISION_OVERRIDE:
commands:
- {{ utr_install_win }}
- {{ upm_ci_install }}
Expand All @@ -23,12 +25,12 @@
- move /Y .\Assets\Samples.meta .\Packages\com.unity.inputsystem
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
# Run upm-ci verification tests as well as tests contained in the package.
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }}
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {% if EDITOR_REVISION_OVERRIDE == nil %} {{ editor.version }} {% else %} %EDITOR_REVISION_OVERRIDE% {% endif %}
{% if platform.name == "win" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem"
--extra-utr-arg="--coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Package" {% endif %}
{% if platform.installscript %}
- {{ unity_downloader_install }}
- {{ platform.installscript }} {{ editor.version }}
- {{ platform.installscript }} {% if EDITOR_REVISION_OVERRIDE == nil %} {{ editor.version }} {% else %} %EDITOR_REVISION_OVERRIDE% {% endif %}
{% endif %}
# ADBv2 on 2019.4 causes the test runner to not start on initial import when the
# samples are in the package. Move the samples back into the project.
Expand All @@ -54,6 +56,8 @@
type: {{ platform.type }}
image: {{ platform.image }}
flavor: {{ platform.flavor }}
variables:
EDITOR_REVISION_OVERRIDE: none
commands:
- {{ utr_install_nix }}
- {{ upm_ci_install }}
Expand All @@ -66,10 +70,10 @@
- mv ./Assets/Samples.meta ./Packages/com.unity.inputsystem
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
# Run upm-ci verification tests as well as tests contained in the package.
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }} {% if platform.name == "mac" or platform.name == "linux" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --extra-utr-arg="--coverage-results-path={{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Package" {% endif %}
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {% if EDITOR_REVISION_OVERRIDE == none %} {{ editor.version }} {% else %} $EDITOR_REVISION_OVERRIDE {% endif %} {% if platform.name == "mac" or platform.name == "linux" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --extra-utr-arg="--coverage-results-path={{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Package" {% endif %}
{% if platform.installscript %}
- {{ unity_downloader_install }}
- {{ platform.installscript }} {{ editor.version }}
- {{ platform.installscript }} {% if EDITOR_REVISION_OVERRIDE == none %} {{ editor.version }} {% else %} $EDITOR_REVISION_OVERRIDE {% endif %}
{% endif %}
# ADBv2 on 2019.4 causes the test runner to not start on initial import when the
# samples are in the package. Move the samples back into the project.
Expand All @@ -96,10 +100,12 @@ build_ios_{{ editor.version }}_{{ category.name }}:
type: Unity::VM::osx
image: {{ ios_and_tvos_macos_bokken_image }}
flavor: b1.large
variables:
EDITOR_REVISION_OVERRIDE: none
commands:
- {{ utr_install_nix }}
- {{ unity_downloader_install }}
- unity-downloader-cli -c Editor -c iOS -u {{ editor.version }} --fast --wait
- unity-downloader-cli -c Editor -c iOS -u {% if EDITOR_REVISION_OVERRIDE == none %} {{ editor.version }} {% else %} $EDITOR_REVISION_OVERRIDE {% endif %} --fast --wait
- ./utr --suite=playmode {% if category.name == "performance" %} --category=Performance {% endif %} --platform=iOS --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --build-only --report-performance-data --performance-project-id=InputSystem
after:
- {{ instabilities_install_nix }}
Expand All @@ -119,6 +125,8 @@ run_ios_{{ editor.version }}_{{ category.name }}:
image: {{ ios_and_tvos_macos_bokken_image }}
model: SE
flavor: b1.medium
variables:
EDITOR_REVISION_OVERRIDE: none
skip_checkout: true
dependencies:
- .yamato/upm-ci.yml#build_ios_{{ editor.version }}_{{ category.name }}
Expand All @@ -140,10 +148,12 @@ build_tvos_{{ editor.version }}:
type: Unity::VM::osx
image: {{ ios_and_tvos_macos_bokken_image }}
flavor: b1.large
variables:
EDITOR_REVISION_OVERRIDE: none
commands:
- {{ utr_install_nix }}
- {{ unity_downloader_install }}
- unity-downloader-cli -c Editor -c AppleTV -u {{ editor.version }} --fast --wait
- unity-downloader-cli -c Editor -c AppleTV -u {% if EDITOR_REVISION_OVERRIDE == none %} {{ editor.version }} {% else %} $EDITOR_REVISION_OVERRIDE {% endif %} --fast --wait
- ./utr --suite=playmode --platform=tvOS --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --build-only --report-performance-data --performance-project-id=InputSystem
after:
- {{ instabilities_install_nix }}
Expand All @@ -162,6 +172,8 @@ run_tvos_{{ editor.version }}:
type: Unity::mobile::appletv
image: {{ ios_and_tvos_macos_bokken_image }}
flavor: b1.medium
variables:
EDITOR_REVISION_OVERRIDE: none
skip_checkout: true
dependencies:
- .yamato/upm-ci.yml#build_tvos_{{ editor.version }}
Expand All @@ -184,10 +196,12 @@ build_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}:
type: Unity::VM
image: package-ci/win10:default
flavor: b1.xlarge
variables:
EDITOR_REVISION_OVERRIDE: none
commands:
- {{ utr_install_win }}
- {{ unity_downloader_install }}
- unity-downloader-cli -c Editor -c Android -u {{ editor.version }} --fast --wait
- unity-downloader-cli -c Editor -c Android -u {% if EDITOR_REVISION_OVERRIDE == none %} {{ editor.version }} {% else %} %EDITOR_REVISION_OVERRIDE% {% endif %} --fast --wait
- ./utr --suite=playmode {% if category.name == "performance" %} --category=Performance {% endif %} --platform=Android --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --scripting-backend={{ backend.name }} --build-only --repository --performance-project-id=InputSystem
after:
- {{ instabilities_install_win }}
Expand All @@ -206,6 +220,8 @@ run_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}:
type: Unity::mobile::shield
image: package-ci/win10:default
flavor: b1.medium
variables:
EDITOR_REVISION_OVERRIDE: none
# Skip repository cloning
skip_checkout: true
# Set a dependency on the build job
Expand Down Expand Up @@ -237,7 +253,7 @@ run_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}:
{% endfor %} # editors

all_tests:
name: All Tests
name: All Tests
dependencies:
{% for editor in editors %}
{% for platform in platforms_win %}
Expand Down
Loading