Skip to content

[CI][aot] Do not overwrite scenarios argument if they were passed #103229

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

Merged
ilonatommy merged 10 commits into from
Jun 12, 2024
Merged

[CI][aot] Do not overwrite scenarios argument if they were passed #103229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8fae998
Use fixed scenarios only when they are not passed.
ilonatommy Jun 10, 2024
935a441
Feedback.
ilonatommy Jun 10, 2024
acf237c
Dummy change to trigger the CI.
ilonatommy Jun 11, 2024
7c3fddd
Fix: the indentation problem.
ilonatommy Jun 11, 2024
44bf7ac
Fix: syntax problem.
ilonatommy Jun 11, 2024
33d5ec9
Revert: syntax change did not help.
ilonatommy Jun 11, 2024
4dd5d6c
Fix: remove `empty` keyword
ilonatommy Jun 11, 2024
aaf265e
Fix
ilonatommy Jun 11, 2024
7e72824
String -> array.
ilonatommy Jun 11, 2024
60335b5
Block.
ilonatommy Jun 11, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions eng/pipelines/common/templates/wasm-library-aot-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ parameters:
runAOT: false
shouldRunSmokeOnly: false
shouldContinueOnError: false
scenarios: []

jobs:

Expand All @@ -31,9 +32,12 @@ jobs:
shouldRunSmokeOnly: ${{ parameters.shouldRunSmokeOnly }}
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
scenarios:
- ${{ if eq(platform, 'browser_wasm') }}:
- WasmTestOnV8
- ${{ if eq(platform, 'browser_wasm_win') }}:
- WasmTestOnChrome
- ${{ if or(eq(platform, 'wasi_wasm_win'), eq(platform, 'wasi_wasm')) }}:
- WasmTestOnWasmtime
- ${{ if ne(parameters.scenarios[0], '') }}:
- ${{ parameters.scenarios }}
- ${{ else }}:
- ${{ if eq(platform, 'browser_wasm') }}:
- WasmTestOnV8
- ${{ if eq(platform, 'browser_wasm_win') }}:
- WasmTestOnChrome
- ${{ if or(eq(platform, 'wasi_wasm_win'), eq(platform, 'wasi_wasm')) }}:
- WasmTestOnWasmtime
31 changes: 16 additions & 15 deletions eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,21 +201,22 @@ jobs:
- WasmTestOnFirefox
- WasmTestOnNodeJS

# Hybrid Globalization AOT tests
- template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml
parameters:
platforms:
- browser_wasm
- browser_wasm_win
nameSuffix: _HybridGlobalization_AOT
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) /p:HybridGlobalization=true
runAOT: true
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
alwaysRun: true
scenarios:
- WasmTestOnChrome
- WasmTestOnNodeJS
# # Hybrid Globalization AOT tests
# # ActiveIssue: https://github.com/dotnet/runtime/issues/51746
# - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml
# parameters:
# platforms:
# - browser_wasm
# - browser_wasm_win
# nameSuffix: _HybridGlobalization_AOT
# extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) /p:HybridGlobalization=true
# runAOT: true
# isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
# isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
# alwaysRun: true
# scenarios:
# - WasmTestOnChrome
# - WasmTestOnNodeJS

- ${{ if and(ne(parameters.isRollingBuild, true), ne(parameters.excludeNonLibTests, true), ne(parameters.debuggerTestsOnly, true)) }}:
# Builds only
Expand Down