Skip to content

Commit

Permalink
Remove setup_env_azure.bat (microsoft#18482)
Browse files Browse the repository at this point in the history
### Description
<!-- Describe your changes. -->



### Motivation and Context
<!-- - Why is this change required? What problem does it solve?
- If it fixes an open issue, please link to the issue here. -->
  • Loading branch information
jchen351 authored Nov 20, 2023
1 parent 1af0681 commit 1dd9bf5
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ parameters:

- name: EnvSetupScript
type: string
default: setup_env.bat

- name: job_name_suffix
type: string
Expand Down
19 changes: 10 additions & 9 deletions tools/ci_build/github/azure-pipelines/win-ci-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ stages:
- template: templates/jobs/win-ci-vs-2022-job.yml
parameters:
BuildConfig: 'Debug'
EnvSetupScript: setup_env.bat
buildArch: x64
additionalBuildFlags: --build_java --build_nodejs --build_wheel --disable_memleak_checker
msbuildPlatform: x64
Expand All @@ -59,7 +58,6 @@ stages:
- template: templates/jobs/win-ci-vs-2022-job.yml
parameters:
BuildConfig: 'RelWithDebInfo'
EnvSetupScript: setup_env.bat
buildArch: x64
# Compare to our Nuget packaging pipeline, this job has "--build_wheel" but doesn't have "--enable_lto --disable_rtti --use_telemetry --enable_wcos"
# Python bindings use typeid so I can't disable RTTI here. If it causes a problem, we will need to split this job to two jobs.
Expand All @@ -80,7 +78,6 @@ stages:
- template: templates/jobs/win-ci-vs-2022-job.yml
parameters:
BuildConfig: 'RelWithDebInfo'
EnvSetupScript: setup_env.bat
buildArch: x64
additionalBuildFlags: --build_wheel --use_dnnl --build_java
msbuildPlatform: x64
Expand All @@ -101,7 +98,6 @@ stages:
- template: templates/jobs/win-ci-vs-2022-job.yml
parameters:
BuildConfig: 'RelWithDebInfo'
EnvSetupScript: setup_env.bat
buildArch: x64
additionalBuildFlags: --build_wheel --use_xnnpack
msbuildPlatform: x64
Expand All @@ -120,7 +116,6 @@ stages:
- template: templates/jobs/win-ci-vs-2022-job.yml
parameters:
BuildConfig: 'RelWithDebInfo'
EnvSetupScript: setup_env.bat
buildArch: x64
additionalBuildFlags: --use_winml --enable_wcos --disable_rtti --cmake_extra_defines CMAKE_SYSTEM_VERSION=10.0.22000.0
msbuildPlatform: x64
Expand Down Expand Up @@ -160,7 +155,6 @@ stages:
- template: templates/jobs/win-ci-vs-2022-job.yml
parameters:
BuildConfig: 'Debug'
EnvSetupScript: setup_env.bat
buildArch: x64
additionalBuildFlags: --enable_training --build_wheel --disable_memleak_checker
msbuildPlatform: x64
Expand All @@ -179,7 +173,6 @@ stages:
- template: templates/jobs/win-ci-vs-2022-job.yml
parameters:
BuildConfig: 'RelWithDebInfo'
EnvSetupScript: setup_env.bat
buildArch: x64
additionalBuildFlags: --enable_training --build_wheel
msbuildPlatform: x64
Expand All @@ -198,7 +191,6 @@ stages:
- template: templates/jobs/win-ci-vs-2022-job.yml
parameters:
BuildConfig: 'RelWithDebInfo'
EnvSetupScript: setup_env.bat
buildArch: x64
additionalBuildFlags: --enable_training_apis
msbuildPlatform: x64
Expand All @@ -215,10 +207,17 @@ stages:
- stage: x64_release_azure
dependsOn: []
jobs:
- job:
steps:
- powershell: |
Write-Host "##vso[task.prependpath]$(Build.BinariesDirectory)\RelWithDebInfo\_deps\vcpkg-src\installed\x86-windows\bin"
$env:PATH
Write-Host "##vso[task.prependpath]$(Build.BinariesDirectory)\RelWithDebInfo\_deps\vcpkg-src\installed\x64-windows\bin"
$env:PATH
displayName: 'Append x64-windows and x86-windows to PATH'
- template: templates/jobs/win-ci-vs-2022-job.yml
parameters:
BuildConfig: 'RelWithDebInfo'
EnvSetupScript: setup_env_azure.bat
buildArch: x64
additionalBuildFlags: --use_azure --use_lock_free_queue
msbuildPlatform: x64
Expand All @@ -231,3 +230,5 @@ stages:
GenerateDocumentation: false
WITH_CACHE: true
MachinePool: 'onnxruntime-Win-CPU-2022'


4 changes: 0 additions & 4 deletions tools/ci_build/github/windows/setup_env_azure.bat

This file was deleted.

0 comments on commit 1dd9bf5

Please sign in to comment.