Address review comments

sethmlarson · sethmlarson · commit 3ce0ff9c8040 · 2023-10-04T16:05:52.000-05:00
diff --git a/windows-release/azure-pipelines.yml b/windows-release/azure-pipelines.yml
@@ -20,9 +20,9 @@ parameters:
   type: string
   default: main
 - name: SourceCommit
-  displayName: "Git commit (empty to disable commit SHA check)"
+  displayName: "Git commit ('empty' to disable commit SHA check)"
   type: string
-  default: ''
+  default: 'empty'
 - name: DoPublish
   displayName: "Publish release"
   type: boolean
@@ -94,7 +94,10 @@ variables:
   ${{ else }}:
     GitRemote: ${{ parameters.GitRemote_Other }}
   SourceTag: ${{ parameters.SourceTag }}
-  SourceCommit: ${{ parameters.SourceCommit }}
+  ${{ if ne(parameters.SourceCommit, 'empty') }}:
+    SourceCommit: ${{ parameters.SourceCommit }}
+  ${{ else }}:
+    SourceCommit: ''
   ${{ if ne(parameters.SigningCertificate, 'Unsigned') }}:
     SigningCertificate: ${{ parameters.SigningCertificate }}
   SigningDescription: ${{ parameters.SigningDescription }}
diff --git a/windows-release/checkout.yml b/windows-release/checkout.yml
@@ -22,8 +22,8 @@ steps:
 
 - powershell: |
     $checkout_commit = (git rev-parse HEAD)
-    if ($checkout_commit -ne $GitCommit) {
-        throw "Expected git commit '$(GitCommit)' didn't match tagged commit '$(checkout_commit)'"
+    if ($checkout_commit -ne SourceCommit) {
+        throw "Expected git commit '$(SourceCommit)' didn't match tagged commit '$(checkout_commit)'"
     }
   displayName: "Verify CPython commit matches tag"
-  condition: and(succeeded(), and(variables['GitCommit']))
+  condition: and(succeeded(), variables['SourceCommit'])
