Skip to content

[release/v7.5] Fix MSIX stage in release pipeline #25345

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
TravisEz13 merged 2 commits into from
Apr 11, 2025
Merged

[release/v7.5] Fix MSIX stage in release pipeline #25345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcf2673
Cherry-pick PR #24900 with conflicts for manual resolution
jshigetomi Jan 31, 2025
8f7cd36
Fix MSIX stage in release pipeline
TravisEz13 Apr 11, 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
17 changes: 7 additions & 10 deletions .pipelines/PowerShell-Release-Official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,10 @@ extends:
displayName: 'Validate Linux ARM64 Fxd Packages'
jobtype: 'linux'
artifactName: 'drop_linux_package_fxdependent'
# this is really an architecture independent package
packageNamePattern: '**/*linux-x64-fxdependent.tar.gz'
arm64: 'yes'
enableCredScan: false

- stage: validatePackages
displayName: 'Validate Packages'
Expand Down Expand Up @@ -333,25 +335,20 @@ extends:
displayName: Publish PMC
dependsOn: PushGitTagAndMakeDraftPublic
jobs:
- template: /.pipelines/templates/release-publish-pmc.yml@self
- template: /.pipelines/templates/approvalJob.yml@self
parameters:
skipPublish: ${{ parameters.SkipPMCPublish }}
displayName: Publish to PMC
jobName: ReleaseToPMC
instructions: |
Run PowerShell-Release-Official-Azure.yml pipeline to publish to PMC

- stage: ReleaseDocker
dependsOn: PushGitTagAndMakeDraftPublic
displayName: 'Docker Release'
jobs:
- template: /.pipelines/templates/approvalJob.yml@self
parameters:
displayName: Start Docker Build
jobName: StartDockerBuild
instructions: |
Kick off Docker build

- template: /.pipelines/templates/approvalJob.yml@self
parameters:
displayName: Start Docker Release
dependsOnJob: StartDockerBuild
jobName: StartDockerRelease
instructions: |
Kickoff docker release
Expand Down
26 changes: 6 additions & 20 deletions .pipelines/templates/release-create-msix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,16 @@ jobs:
} else {
$toolsDir = '$(Pipeline.Workspace)\releasePipeline\tools'
New-Item $toolsDir -Type Directory -Force > $null
Invoke-RestMethod -Uri '$(makeappUrl)' -OutFile "$toolsDir\makeappx.zip"
Expand-Archive "$toolsDir\makeappx.zip" -DestinationPath "$toolsDir\makeappx" -Force
$exePath = "$toolsDir\makeappx\makeappx.exe"

Write-Verbose -Verbose 'makeappx was installed:'
Get-ChildItem -Path $toolsDir -Recurse
$makeappx = Get-ChildItem -Recurse 'C:\Program Files (x86)\Windows Kits\10\makeappx.exe' |
Where-Object { $_.DirectoryName -match 'x64' } |
Select-Object -Last 1
$exePath = $makeappx.FullName
Write-Verbose -Verbose 'makeappx was found:'
}

$vstsCommandString = "vso[task.setvariable variable=MakeAppxPath]$exePath"
Write-Host "sending " + $vstsCommandString
Write-Host "##$vstsCommandString"
displayName: Install makeappx tool
displayName: Find makeappx tool
retryCountOnTaskFailure: 1

- pwsh: |
Expand Down Expand Up @@ -77,18 +75,6 @@ jobs:
displayName: Create MsixBundle
retryCountOnTaskFailure: 1

- pwsh: |
$azureRmModule = Get-InstalledModule AzureRM -ErrorAction SilentlyContinue -Verbose
if ($azureRmModule) {
Write-Host 'AzureRM module exists. Removing it'
Uninstall-AzureRm
Write-Host 'AzureRM module removed'
}

Install-Module -Name Az.Storage -Force -AllowClobber -Scope CurrentUser -Verbose

displayName: Remove AzRM modules and install Az.Storage

- task: AzurePowerShell@5
displayName: Upload msix to blob
inputs:
Expand Down
29 changes: 23 additions & 6 deletions .pipelines/templates/release-validate-fxdpackages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,25 @@
parameters:
jobName: ""
displayName: ""
jobtype: ""
artifactName: ""
packageNamePattern: ""
arm64: "no"
- name: jobName
type: string
default: ""
- name: displayName
type: string
default: ""
- name: jobtype
type: string
default: ""
- name: artifactName
type: string
default: ""
- name: packageNamePattern
type: string
default: ""
- name: arm64
type: string
default: "no"
- name: enableCredScan
type: boolean
default: true

jobs:
- job: ${{ parameters.jobName }}
Expand All @@ -19,6 +34,8 @@ jobs:
value: $(Build.SourcesDirectory)\PowerShell\.config\suppress.json
- name: ob_sdl_tsa_configFile
value: $(Build.SourcesDirectory)\PowerShell\.config\tsaoptions.json
- name: ob_sdl_credscan_enabled
value: ${{ parameters.enableCredScan }}

pool:
type: ${{ parameters.jobtype }}
Expand Down
4 changes: 2 additions & 2 deletions .pipelines/templates/uploadToAzure.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
type: windows
variables:
- name: ob_sdl_sbom_enabled
value: false
value: true
- name: runCodesignValidationInjection
value: false
- name: NugetSecurityAnalysisWarningLevel
Expand Down Expand Up @@ -241,7 +241,7 @@ jobs:
Write-Verbose -Verbose "Creating output directory for GitHub Release files: $(ob_outputDirectory)/GitHubPackages"
New-Item -Path $(ob_outputDirectory)/GitHubPackages -ItemType Directory -Force
Get-ChildItem -Path "$(Build.ArtifactStagingDirectory)/downloads/*" -Recurse |
Where-Object { $_.Extension -notin '.msix', '.nupkg' } |
Where-Object { $_.Extension -notin '.msix', '.nupkg' -and $_.Name -notmatch '-gc'} |
Copy-Item -Destination $(ob_outputDirectory)/GitHubPackages -Recurse -Verbose

Write-Verbose -Verbose "Creating output directory for NuGet packages: $(ob_outputDirectory)/NuGetPackages"
Expand Down
Loading