Skip to content

Commit a180cc5

Browse files
committed
Copy Activate.ps1 script unconditionally between build stages
1 parent 188af53 commit a180cc5

File tree

5 files changed

+13
-18
lines changed

5 files changed

+13
-18
lines changed

windows-release/msi-steps.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ steps:
3232
targetPath: $(Pipeline.Workspace)\${{ a.artifact }}
3333

3434
# Assuming we'll always run the amd64 build
35-
#- ${{ if and(parameters.SigningCertificate, eq(a.artifact, 'bin_amd64')) }}:
36-
# DO NOT MERGE: skipping signing check for testing
3735
- ${{ if eq(a.artifact, 'bin_amd64') }}:
3836
- powershell: >
3937
copy

windows-release/stage-layout-full.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,9 @@ jobs:
129129
displayName: 'Update TCL_LIBRARY'
130130
condition: and(succeeded(), variables['TclLibrary'])
131131
132-
- ${{ if parameters.SigningCertificate }}:
133-
- powershell: |
134-
copy "$(Pipeline.Workspace)\bin_$(Name)\Activate.ps1" Lib\venv\scripts\common\Activate.ps1 -Force
135-
displayName: 'Copy signed files into sources'
132+
- powershell: |
133+
copy "$(Pipeline.Workspace)\bin_$(Name)\Activate.ps1" Lib\venv\scripts\common\Activate.ps1 -Force -Verbose
134+
displayName: 'Copy signed files into sources'
136135
137136
- template: ./layout-command.yml
138137
parameters:

windows-release/stage-layout-msix.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ jobs:
8282
artifact: cert
8383
targetPath: $(Pipeline.Workspace)\cert
8484

85-
- powershell: |
86-
copy "$(Pipeline.Workspace)\bin_$(Name)\Activate.ps1" Lib\venv\scripts\common\Activate.ps1 -Force
87-
displayName: 'Copy signed files into sources'
85+
- powershell: |
86+
copy "$(Pipeline.Workspace)\bin_$(Name)\Activate.ps1" Lib\venv\scripts\common\Activate.ps1 -Force -Verbose
87+
displayName: 'Copy signed files into sources'
8888
8989
- template: ./layout-command.yml
9090
parameters:

windows-release/stage-layout-nuget.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,9 @@ jobs:
6262
artifact: bin_$(Name)
6363
targetPath: $(Pipeline.Workspace)\bin_$(Name)
6464

65-
- ${{ if parameters.SigningCertificate }}:
66-
- powershell: |
67-
copy $(Pipeline.Workspace)\bin_$(Name)\Activate.ps1 Lib\venv\scripts\common\Activate.ps1 -Force
68-
displayName: 'Copy signed files into sources'
65+
- powershell: |
66+
copy $(Pipeline.Workspace)\bin_$(Name)\Activate.ps1 Lib\venv\scripts\common\Activate.ps1 -Force -Verbose
67+
displayName: 'Copy signed files into sources'
6968
7069
- template: ./layout-command.yml
7170
parameters:

windows-release/stage-layout-pymanager.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,10 @@ jobs:
173173
displayName: 'Update TCL_LIBRARY'
174174
condition: and(succeeded(), variables['TclLibrary'])
175175
176-
- ${{ if parameters.SigningCertificate }}:
177-
- powershell: |
178-
copy "$(Pipeline.Workspace)\$(BinArtifact)\Activate.ps1" Lib\venv\scripts\common\Activate.ps1 -Force
179-
displayName: 'Copy signed files into sources'
180-
workingDirectory: $(Build.SourcesDirectory)\cpython
176+
- powershell: |
177+
copy "$(Pipeline.Workspace)\$(BinArtifact)\Activate.ps1" Lib\venv\scripts\common\Activate.ps1 -Force -Verbose
178+
displayName: 'Copy signed files into sources'
179+
workingDirectory: $(Build.SourcesDirectory)\cpython
181180
182181
- template: ./layout-command.yml
183182
parameters:

0 commit comments

Comments
 (0)