Skip to content

Update macOS build image and root folder for build #16609

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
anmenaga merged 2 commits into from
Dec 13, 2021
Merged

Update macOS build image and root folder for build #16609

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
7c05015
Update macos build image and root folder for build
adityapatwardhan Dec 13, 2021
1b74955
Update package yaml as well
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
2 changes: 1 addition & 1 deletion tools/releaseBuild/azureDevOps/templates/cloneToOfficialPath.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
steps:
- powershell: |
$dirSeparatorChar = [system.io.path]::DirectorySeparatorChar
$nativePath = "${dirSeparatorChar}PowerShell"
$nativePath = "${env:HOME}${dirSeparatorChar}PowerShell"
Copy link
Member

@TravisEz13 TravisEz13 Dec 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'll have to move this under the agent working directory at one point.

Write-Host "##vso[task.setvariable variable=PowerShellRoot]$nativePath"
if ((Test-Path "$nativePath")) {
Expand Down
2 changes: 1 addition & 1 deletion 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-10.14
vmImage: internal-macos-11
Copy link
Member

@TravisEz13 TravisEz13 Dec 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be macos-11

variables:
# Turn off Homebrew analytics
- name: HOMEBREW_NO_ANALYTICS
Expand Down
12 changes: 7 additions & 5 deletions 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-10.14
vmImage: internal-macos-11
variables:
# Turn off Homebrew analytics
- name: HOMEBREW_NO_ANALYTICS
Expand All @@ -28,11 +28,11 @@ jobs:

- pwsh: |
# create folder
sudo mkdir /PowerShell
sudo mkdir "${env:HOME}/PowerShell"

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

- template: cloneToOfficialPath.yml

Expand All @@ -46,7 +46,9 @@ jobs:

- pwsh: |
$env:AzDevOpsFeedPAT2 = '$(AzDevOpsFeedPAT2)'
$(Build.SourcesDirectory)/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 -ReleaseTag $(ReleaseTagVar) -Destination $(System.ArtifactsDirectory) -Symbols -location $(PowerShellRoot) -Build -ArtifactName macosBinResults -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) -Symbols -location $(PowerShellRoot) -Build -ArtifactName macosBinResults -Runtime 'osx-${{ parameters.buildArchitecture }}' -SkipReleaseChecks
$env:AzDevOpsFeedPAT2 = $null
displayName: 'Build'

Expand Down