gh-355: In Windows build, improves the reliability of including the signed Activate.ps1 script (GH-357)

Author: zooba

windows-release/msi-steps.yml

@@ -31,10 +31,20 @@ steps:
         ${{ else }}:
           targetPath: $(Pipeline.Workspace)\${{ a.artifact }}
 
-  - ${{ if parameters.SigningCertificate }}:
-    - powershell: |
-        copy $(Py_OutDir)\amd64\Activate.ps1 Lib\venv\scripts\common\Activate.ps1 -Force
-      displayName: 'Copy signed files into sources'
+    # Assuming we'll always run the amd64 build
+    - ${{ if eq(a.artifact, 'bin_amd64') }}:
+      - powershell: >
+          copy
+          "${env:TARGET_PATH}\Activate.ps1"
+          "$(Build.SourcesDirectory)\Lib\venv\scripts\common\Activate.ps1"
+          -Force
+          -Verbose
+        displayName: 'Copy signed files into sources'
+        env:
+          ${{ if a.target }}:
+            TARGET_PATH: ${{ a.target }}
+          ${{ else }}:
+            TARGET_PATH: $(Pipeline.Workspace)\${{ a.artifact }}
 
   - script: |
       call PCbuild\find_python.bat "%PYTHON%"

windows-release/stage-layout-full.yml

@@ -129,10 +129,9 @@ jobs:
     displayName: 'Update TCL_LIBRARY'
     condition: and(succeeded(), variables['TclLibrary'])
 
-  - ${{ if parameters.SigningCertificate }}:
-    - powershell: |
-        copy "$(Pipeline.Workspace)\bin_$(Name)\Activate.ps1" Lib\venv\scripts\common\Activate.ps1 -Force
-      displayName: 'Copy signed files into sources'
+  - powershell: |
+      copy "$(Pipeline.Workspace)\bin_$(Name)\Activate.ps1" Lib\venv\scripts\common\Activate.ps1 -Force -Verbose
+    displayName: 'Copy signed files into sources'
 
   - template: ./layout-command.yml
     parameters:

windows-release/stage-layout-msix.yml

@@ -82,9 +82,9 @@ jobs:
         artifact: cert
         targetPath: $(Pipeline.Workspace)\cert
 
-    - powershell: |
-        copy "$(Pipeline.Workspace)\bin_$(Name)\Activate.ps1" Lib\venv\scripts\common\Activate.ps1 -Force
-      displayName: 'Copy signed files into sources'
+  - powershell: |
+      copy "$(Pipeline.Workspace)\bin_$(Name)\Activate.ps1" Lib\venv\scripts\common\Activate.ps1 -Force -Verbose
+    displayName: 'Copy signed files into sources'
 
   - template: ./layout-command.yml
     parameters:

windows-release/stage-layout-nuget.yml

@@ -62,10 +62,9 @@ jobs:
       artifact: bin_$(Name)
       targetPath: $(Pipeline.Workspace)\bin_$(Name)
 
-  - ${{ if parameters.SigningCertificate }}:
-    - powershell: |
-        copy $(Pipeline.Workspace)\bin_$(Name)\Activate.ps1 Lib\venv\scripts\common\Activate.ps1 -Force
-      displayName: 'Copy signed files into sources'
+  - powershell: |
+      copy $(Pipeline.Workspace)\bin_$(Name)\Activate.ps1 Lib\venv\scripts\common\Activate.ps1 -Force -Verbose
+    displayName: 'Copy signed files into sources'
 
   - template: ./layout-command.yml
     parameters:

windows-release/stage-layout-pymanager.yml

@@ -173,11 +173,10 @@ jobs:
     displayName: 'Update TCL_LIBRARY'
     condition: and(succeeded(), variables['TclLibrary'])
 
-  - ${{ if parameters.SigningCertificate }}:
-    - powershell: |
-        copy "$(Pipeline.Workspace)\$(BinArtifact)\Activate.ps1" Lib\venv\scripts\common\Activate.ps1 -Force
-      displayName: 'Copy signed files into sources'
-      workingDirectory: $(Build.SourcesDirectory)\cpython
+  - powershell: |
+      copy "$(Pipeline.Workspace)\$(BinArtifact)\Activate.ps1" Lib\venv\scripts\common\Activate.ps1 -Force -Verbose
+    displayName: 'Copy signed files into sources'
+    workingDirectory: $(Build.SourcesDirectory)\cpython
 
   - template: ./layout-command.yml
     parameters: