From 47903e701a4b20b8f43ba2c77392db8c31a3f664 Mon Sep 17 00:00:00 2001 From: Yulong Wang <7679871+fs-eire@users.noreply.github.com> Date: Wed, 27 Mar 2024 10:35:43 -0700 Subject: [PATCH] fix condition in web CI YAML (#20095) ### Description fix condition in web CI YAML --- .../github/azure-pipelines/templates/win-web-ci.yml | 12 ++++++------ .../templates/win-web-multi-browsers.yml | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/templates/win-web-ci.yml b/tools/ci_build/github/azure-pipelines/templates/win-web-ci.yml index b7aee559cf73c..fa6103fb8a59d 100644 --- a/tools/ci_build/github/azure-pipelines/templates/win-web-ci.yml +++ b/tools/ci_build/github/azure-pipelines/templates/win-web-ci.yml @@ -155,7 +155,7 @@ jobs: - script: | powershell "Get-WmiObject Win32_Process -Filter \"name = 'chrome.exe'\" | Format-List CommandLine" displayName: 'Check active Chrome processes (before test)' - condition: and(succeeded(), eq('$(Agent.Diagnostic)', 'true')) + condition: and(succeeded(), eq(variables['Agent.Diagnostic'], 'true')) - script: | mkdir $(Agent.TempDirectory)\web\test\01 npm test -- -e=chrome -b=webgl,wasm --user-data-dir=$(Agent.TempDirectory)\web\test\01 @@ -165,7 +165,7 @@ jobs: - script: | powershell "Get-WmiObject Win32_Process -Filter \"name = 'chrome.exe'\" | Format-List CommandLine" displayName: 'Check active Chrome processes (before test)' - condition: and(succeeded(), eq('$(Agent.Diagnostic)', 'true')) + condition: and(succeeded(), eq(variables['Agent.Diagnostic'], 'true')) - script: | mkdir $(Agent.TempDirectory)\web\test\02 npm test -- -e=chrome -b=webgl,wasm,webgpu $(webgpuCommandlineExtraFlags) --user-data-dir=$(Agent.TempDirectory)\web\test\02 @@ -175,7 +175,7 @@ jobs: - script: | powershell "Get-WmiObject Win32_Process -Filter \"name = 'chrome.exe'\" | Format-List CommandLine" displayName: 'Check active Chrome processes (before test)' - condition: and(succeeded(), eq('$(Agent.Diagnostic)', 'true')) + condition: and(succeeded(), eq(variables['Agent.Diagnostic'], 'true')) - script: | mkdir $(Agent.TempDirectory)\web\test\03 npm test -- suite1 -e=chrome -b=webgpu --io-binding=gpu-tensor $(webgpuCommandlineExtraFlags) --user-data-dir=$(Agent.TempDirectory)\web\test\03 @@ -185,7 +185,7 @@ jobs: - script: | powershell "Get-WmiObject Win32_Process -Filter \"name = 'chrome.exe'\" | Format-List CommandLine" displayName: 'Check active Chrome processes (before test)' - condition: and(succeeded(), eq('$(Agent.Diagnostic)', 'true')) + condition: and(succeeded(), eq(variables['Agent.Diagnostic'], 'true')) - script: | mkdir $(Agent.TempDirectory)\web\test\04 npm test -- suite1 -e=chrome -b=webgpu --io-binding=gpu-location $(webgpuCommandlineExtraFlags) --user-data-dir=$(Agent.TempDirectory)\web\test\04 @@ -195,7 +195,7 @@ jobs: - script: | powershell "Get-WmiObject Win32_Process -Filter \"name = 'chrome.exe'\" | Format-List CommandLine" displayName: 'Check active Chrome processes (before test)' - condition: and(succeeded(), eq('$(Agent.Diagnostic)', 'true')) + condition: and(succeeded(), eq(variables['Agent.Diagnostic'], 'true')) - script: | mkdir $(Agent.TempDirectory)\web\test\05 npm test -- --webgl.pack -b=webgl -e=chrome --user-data-dir=$(Agent.TempDirectory)\web\test\05 @@ -204,7 +204,7 @@ jobs: - script: | powershell "Get-WmiObject Win32_Process -Filter \"name = 'chrome.exe'\" | Format-List CommandLine" displayName: 'Check active Chrome processes (before test)' - condition: and(succeeded(), eq('$(Agent.Diagnostic)', 'true')) + condition: and(succeeded(), eq(variables['Agent.Diagnostic'], 'true')) - script: | mkdir $(Agent.TempDirectory)\web\test\06 npm test -- --wasm.proxy -b=wasm -e=chrome --user-data-dir=$(Agent.TempDirectory)\web\test\06 diff --git a/tools/ci_build/github/azure-pipelines/templates/win-web-multi-browsers.yml b/tools/ci_build/github/azure-pipelines/templates/win-web-multi-browsers.yml index 00109b348e8cb..a0af221607dc8 100644 --- a/tools/ci_build/github/azure-pipelines/templates/win-web-multi-browsers.yml +++ b/tools/ci_build/github/azure-pipelines/templates/win-web-multi-browsers.yml @@ -70,7 +70,7 @@ jobs: - script: | powershell "Get-WmiObject Win32_Process -Filter \"name = 'chrome.exe'\" | Format-List CommandLine" displayName: 'Check active Chrome processes (before test)' - condition: and(succeeded(), eq('$(Agent.Diagnostic)', 'true')) + condition: and(succeeded(), eq(variables['Agent.Diagnostic'], 'true')) - script: | mkdir $(Agent.TempDirectory)\web\test_multi_browsers\01 npm test -- suite0 -e=chrome -b=wasm,webgl --wasm.initTimeout=30000 --file-cache --user-data-dir=$(Agent.TempDirectory)\web\test_multi_browsers\01 @@ -79,7 +79,7 @@ jobs: - script: | powershell "Get-WmiObject Win32_Process -Filter \"name = 'firefox.exe'\" | Format-List CommandLine" displayName: 'Check active Firefox processes (before test)' - condition: and(succeeded(), eq('$(Agent.Diagnostic)', 'true')) + condition: and(succeeded(), eq(variables['Agent.Diagnostic'], 'true')) - script: | mkdir $(Agent.TempDirectory)\web\test_multi_browsers\02 npm test -- suite0 -b=wasm,webgl -e=firefox --wasm.initTimeout=30000 --file-cache --user-data-dir=$(Agent.TempDirectory)\web\test_multi_browsers\02 @@ -88,7 +88,7 @@ jobs: - script: | powershell "Get-WmiObject Win32_Process -Filter \"name = 'msedge.exe'\" | Format-List CommandLine" displayName: 'Check active Edge processes (before test)' - condition: and(succeeded(), eq('$(Agent.Diagnostic)', 'true')) + condition: and(succeeded(), eq(variables['Agent.Diagnostic'], 'true')) - script: | mkdir $(Agent.TempDirectory)\web\test_multi_browsers\03 npm test -- suite0 -b=wasm,webgl -e=edge --wasm.initTimeout=30000 --file-cache --user-data-dir=$(Agent.TempDirectory)\web\test_multi_browsers\03