Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Update the vmImage and PowerShell root directory for macOS builds #16611

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
adityapatwardhan merged 3 commits into from
Dec 14, 2021
Merged

Update the vmImage and PowerShell root directory for macOS builds #16611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02f25bf
Fix macos packaging build and update vmImage
adityapatwardhan Dec 13, 2021
1fd8b4f
Use Agent.TempDirectory for PowerShell root
adityapatwardhan Dec 13, 2021
6dba095
Fix typo
adityapatwardhan Dec 13, 2021
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
5 changes: 4 additions & 1 deletion 5 tools/releaseBuild/azureDevOps/templates/cloneToOfficialPath.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
parameters:
nativePathRoot: ''

steps:
- powershell: |
$dirSeparatorChar = [system.io.path]::DirectorySeparatorChar
$nativePath = "${env:HOME}${dirSeparatorChar}PowerShell"
$nativePath = "${{parameters.nativePathRoot }}${dirSeparatorChar}PowerShell"
Write-Host "##vso[task.setvariable variable=PowerShellRoot]$nativePath"

if ((Test-Path "$nativePath")) {
Expand Down
14 changes: 9 additions & 5 deletions 14 tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
dependsOn: MacFileSigningJob_${{ parameters.buildArchitecture }}
condition: succeeded()
pool:
vmImage: internal-macos-11
vmImage: macos-latest
variables:
# Turn off Homebrew analytics
- name: HOMEBREW_NO_ANALYTICS
Expand All @@ -23,11 +23,11 @@ jobs:

- pwsh: |
# create folder
sudo mkdir /PowerShell
sudo mkdir "$(Agent.TempDirectory)/PowerShell"

# make the current user the owner
sudo chown $env:USER /PowerShell
displayName: 'Create /PowerShell'
sudo chown $env:USER "$(Agent.TempDirectory)/PowerShell"
displayName: 'Create $(Agent.TempDirectory)/PowerShell'

- template: SetVersionVariables.yml
parameters:
Expand All @@ -36,6 +36,8 @@ jobs:
- template: shouldSign.yml

- template: cloneToOfficialPath.yml
parameters:
nativePathRoot: '$(Agent.TempDirectory)'

- task: DownloadBuildArtifacts@0
displayName: Download macosBinResults
Expand Down Expand Up @@ -108,7 +110,9 @@ jobs:
displayName: 'Bootstrap VM'

- pwsh: |
$(Build.SourcesDirectory)/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 -ReleaseTag $(ReleaseTagVar) -Destination $(System.ArtifactsDirectory) -location $(PowerShellRoot) -ArtifactName macosPkgResults -BuildZip $(BuildPackagePath) -ExtraPackage "tar" -Runtime 'osx-${{ parameters.buildArchitecture }}'
# Add -SkipReleaseChecks as a mitigation to unblock release.
# macos-10.15 does not allow creating a folder under root. Hence, moving the folder.
$(Build.SourcesDirectory)/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 -ReleaseTag $(ReleaseTagVar) -Destination $(System.ArtifactsDirectory) -location $(PowerShellRoot) -ArtifactName macosPkgResults -BuildZip $(BuildPackagePath) -ExtraPackage "tar" -Runtime 'osx-${{ parameters.buildArchitecture }}' -SkipReleaseChecks
displayName: 'Package'

- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
Expand Down
10 changes: 6 additions & 4 deletions 10 tools/releaseBuild/azureDevOps/templates/mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
displayName: Build macOS ${{ parameters.buildArchitecture }}
condition: succeeded()
pool:
vmImage: internal-macos-11
vmImage: macos-latest
variables:
# Turn off Homebrew analytics
- name: HOMEBREW_NO_ANALYTICS
Expand All @@ -28,13 +28,15 @@ jobs:

- pwsh: |
# create folder
sudo mkdir "${env:HOME}/PowerShell"
sudo mkdir "$(Agent.TempDirectory)/PowerShell"

# make the current user the owner
sudo chown $env:USER "${env:HOME}/PowerShell"
displayName: 'Create ${env:HOME}/PowerShell'
sudo chown $env:USER "$(Agent.TempDirectory)/PowerShell"
displayName: 'Create $(Agent.TempDirectory)/PowerShell'

- template: cloneToOfficialPath.yml
parameters:
nativePathRoot: '$(Agent.TempDirectory)'

- pwsh: |
tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 -location $(PowerShellRoot) -BootStrap
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.