Skip to content

Commit 5caa78e

Browse files
committed
Minor YAML fixes
1 parent b6b191c commit 5caa78e

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

windows-release/sign-files.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@ steps:
113113
- ${{ if parameters.Include }}:
114114
- powershell: |
115115
if ($env:EXCLUDE) {
116-
$files = (dir ($env:INCLUDE -split ';').Trim() -Exclude ($env:EXCLUDE -split ';').Trim() -File)
116+
$files = (dir ($env:INCLUDE -split ',').Trim() -Exclude ($env:EXCLUDE -split ',').Trim() -File)
117117
} else {
118-
$files = (dir ($env:INCLUDE -split ';').Trim() -File)
118+
$files = (dir ($env:INCLUDE -split ',').Trim() -File)
119119
}
120120
if ($env:FILTER) {
121121
($env:FILTER -split ';').Trim() -join "`n" | Out-File __filelist.txt -Encoding utf8

windows-release/stage-publish-pymanager.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ jobs:
7676
displayName: 'Download PuTTY binaries'
7777
7878
# Use the template just to configure the signing tool.
79+
# This will set MAKECAT and SIGN_COMMAND to be injected into later build steps
7980
- template: sign-files.yml
8081
parameters:
8182
Include: ""
@@ -109,9 +110,6 @@ jobs:
109110
INDEX_URL: '$(PyDotOrgUrlPrefix)python/$(_PyManagerIndexFilename)'
110111
INDEX_FILE: '$(Build.ArtifactStagingDirectory)\index\$(_PyManagerIndexFilename)'
111112
MANIFEST_FILE: '$(Build.ArtifactStagingDirectory)\index\windows.json'
112-
${{ if variables['SIGN_COMMAND'] }}:
113-
MAKECAT: $(MAKECAT)
114-
SIGN_COMMAND: $(SIGN_COMMAND)
115113
116114
- ${{ else }}:
117115
- powershell: |
@@ -131,9 +129,6 @@ jobs:
131129
UPLOAD_HOST_KEY: $(PyDotOrgHostKey)
132130
UPLOAD_USER: $(PyDotOrgUsername)
133131
UPLOAD_KEYFILE: $(sshkey.secureFilePath)
134-
${{ if variables['SIGN_COMMAND'] }}:
135-
MAKECAT: $(MAKECAT)
136-
SIGN_COMMAND: $(SIGN_COMMAND)
137132
138133
- ${{ each alg in parameters.HashAlgorithms }}:
139134
- powershell: |

0 commit comments

Comments
 (0)