Skip to content

Commit 11403aa

Browse files
author
Sheyla Trudo
committed
fixup! Clean up
1 parent 5582878 commit 11403aa

File tree

3 files changed

+8
-17
lines changed

3 files changed

+8
-17
lines changed

.pipelines/containers/build-variables-template.steps.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,13 @@ steps:
5656
MAKE_EXTRA_BUILD_ARGS: ${{ parameters.image }}-docker-build-args
5757
5858
- ${{ elseif eq(parameters.targetOs, 'windows') }}:
59-
- powershell: |
59+
- task: UsePythonVersion@0
60+
inputs:
61+
versionSpec: '3.x' # string. Required. Version spec. Default: 3.x.
62+
addToPath: true # boolean. Add to PATH. Default: true.
63+
architecture: 'x64'
64+
65+
- pwsh: |
6066
$env:VAR_ID = "$env:IMAGE_$env:OS_$env:ARCH"
6167
6268
$env:BUILD_CONTEXT = (make "$env:MAKE_BUILD_CONTEXT")

.pipelines/containers/containerize.jobs.yaml

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,6 @@ parameters:
1818
- amd64
1919
- arm64
2020

21-
- name: buildOs
22-
type: string
23-
default: linux
24-
values:
25-
- linux
26-
- windows
27-
28-
- name: buildArch
29-
type: string
30-
default: amd64
31-
values:
32-
- amd64
33-
- arm64
34-
3521

3622
jobs:
3723
- ${{ each imageName in parameters.images }}:
@@ -48,7 +34,7 @@ jobs:
4834
pool:
4935
name: $(BUILD_POOL_NAME_DEFAULT_WINDOWS)
5036
os: windows
51-
image: acn-runner-vmss-image-windows-1es-v2.1
37+
image: acn-runner-vmss-image-windows-1es-v2.0
5238

5339
steps:
5440
- checkout: self

.pipelines/run-pipeline.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ stages:
9999
- npm
100100
- template: containers/containerize.jobs.yaml
101101
parameters:
102-
buildOs: windows
103102
targetOs: windows
104103
targetArch: amd64
105104
images:

0 commit comments

Comments
 (0)