Skip to content

Fixes for publish stages of the Windows release #244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zooba merged 6 commits into from
May 7, 2025
Merged

Fixes for publish stages of the Windows release #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b060abf
Remove old layout condition check from Windows release build
zooba May 7, 2025
1fdf676
Enable signing for MSI
zooba May 7, 2025
d67b847
Ensure SigningCertificate variable is set so that WiX detects it
zooba May 7, 2025
bd6b642
We don't publish Doc anymore
zooba May 7, 2025
9620c1d
Fix argument name of download stages
zooba May 7, 2025
a60637c
Helpful comments for the future
zooba May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions windows-release/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,17 @@ parameters:
type: boolean
default: true
- name: DoEmbed
displayName: "Produce embeddable package"
displayName: "Produce embeddable package (w/ PyManager or MSI options)"
type: boolean
default: true
- name: DoMSI
displayName: "Produce EXE/MSI installer"
type: boolean
default: true
- name: TestMSI
displayName: "Run EXE/MSI installer tests"
type: boolean
default: true
- name: DoPyManager
displayName: "Produce PyManager package"
type: boolean
Expand Down Expand Up @@ -224,6 +228,7 @@ stages:
BuildToPackage: ${{ parameters.BuildToPackage }}
DoARM64: ${{ parameters.DoARM64}}
DoFreethreaded: ${{ parameters.DoFreethreaded }}
SigningCertificate: ${{ parameters.SigningCertificate }}
- ${{ if eq(parameters.DoMSIX, 'true') }}:
- template: stage-pack-msix.yml
parameters:
Expand All @@ -247,7 +252,7 @@ stages:
jobs:
- ${{ if eq(parameters.DoEmbed, 'true') }}:
- template: stage-test-embed.yml
- ${{ if eq(parameters.DoMSI, 'true') }}:
- ${{ if and(eq(parameters.DoMSI, 'true'), eq(parameters.TestMSI, 'true')) }}:
- template: stage-test-msi.yml
parameters:
DoFreethreaded: ${{ parameters.DoFreethreaded }}
Expand Down
4 changes: 4 additions & 0 deletions windows-release/msi-steps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ steps:
AZURE_TENANT_ID: $(TrustedSigningTenantId)
AZURE_CLIENT_ID: $(TrustedSigningClientId)
AZURE_CLIENT_SECRET: $(TrustedSigningSecret)
# Only need the variable here for msi.props to detect
SigningCertificate: ${{ parameters.SigningCertificate }}

- ${{ each b in parameters.Bundles }}:
- script: |
Expand All @@ -101,6 +103,8 @@ steps:
AZURE_TENANT_ID: $(TrustedSigningTenantId)
AZURE_CLIENT_ID: $(TrustedSigningClientId)
AZURE_CLIENT_SECRET: $(TrustedSigningSecret)
# Only need the variable here for msi.props to detect
SigningCertificate: ${{ parameters.SigningCertificate }}

- powershell: |
del $env:ResponseFile -ErrorAction Continue
Expand Down
1 change: 0 additions & 1 deletion windows-release/stage-layout-embed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ parameters:
jobs:
- job: Make_Embed_Layout
displayName: Make embeddable layout
condition: and(succeeded(), eq(variables['DoEmbed'], 'true'))

pool:
vmImage: windows-2022
Expand Down
20 changes: 4 additions & 16 deletions windows-release/stage-publish-pythonorg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,6 @@ jobs:
inputs:
versionSpec: '>=3.10'

- task: DownloadPipelineArtifact@2
displayName: 'Download artifact: Doc'
inputs:
${{ if eq(parameters.BuildToPublish, 'current') }}:
buildType: current
${{ else }}:
buildType: specific
buildVersionToDownload: specific
project: $(resources.pipeline.build_to_publish.projectId)
pipeline: $(resources.pipeline.build_to_publish.pipelineId)
runId: $(resources.pipeline.build_to_publish.runID)
artifact: Doc
targetPath: $(Pipeline.Workspace)\Doc

- task: DownloadPipelineArtifact@2
displayName: 'Download artifact: msi'
inputs:
Expand All @@ -63,8 +49,9 @@ jobs:
buildVersionToDownload: specific
project: $(resources.pipeline.build_to_publish.projectId)
pipeline: $(resources.pipeline.build_to_publish.pipelineId)
runId: $(resources.pipeline.build_to_publish.runID)
buildId: $(resources.pipeline.build_to_publish.runID)
artifactName: embed
# Artifact name is added to path for DownloadBuildArtifacts
downloadPath: $(Pipeline.Workspace)

- task: DownloadBuildArtifacts@1
Expand All @@ -77,8 +64,9 @@ jobs:
buildVersionToDownload: specific
project: $(resources.pipeline.build_to_publish.projectId)
pipeline: $(resources.pipeline.build_to_publish.pipelineId)
runId: $(resources.pipeline.build_to_publish.runID)
buildId: $(resources.pipeline.build_to_publish.runID)
artifactName: sbom
# Artifact name is added to path for DownloadBuildArtifacts
downloadPath: $(Pipeline.Workspace)


Expand Down
Loading