File tree Expand file tree Collapse file tree 2 files changed +9
-6
lines changed Expand file tree Collapse file tree 2 files changed +9
-6
lines changed Original file line number Diff line number Diff line change 1010 MANIFEST_DATA=$(echo "$IMAGE_PLATFORM_DATA" | \
1111 jq -r '.[] |
1212 .args = [ (.platform | split("/")[0]), (.platform | split("/")[1]) ] |
13- .args = [ ("--os " + .args[0] ), ("--arch " + .args[1] ) ] |
13+ .args = [ ("--os " + .args[0] ), ("--arch " + .args[1] ) ] |
1414 if .osVersion then .args += ["--os-version " + .osVersion] else . end |
1515 { image: .imageReference, annotate: .args }' | \
1616 jq -rcs)
Original file line number Diff line number Diff line change @@ -111,25 +111,28 @@ jobs:
111111 pool :
112112 os : linux
113113 type : docker
114- ${{ if eq(job_data.job, 'linux_arm64') }} :
115- LinuxHostVersion : ' AzLinux3.0ARM64 '
116- ${{ else }} :
117- LinuxHostVersion : ' AzLinux3.0AMD64'
114+ ${{ if eq(job_data.job, 'linux_arm64') }} :
115+ hostArchitecture : arm64
116+ # ${{ else }}:
117+ # LinuxHostVersion: 'AzLinux3.0AMD64'
118118 variables :
119119 ob_outputDirectory : $(Build.ArtifactStagingDirectory)
120120 ob_artifactSuffix : _$(name)
121121 ob_git_checkout : false
122122 ob_extract_root_artifact : true
123123 ${{ if eq(job_data.job, 'linux_amd64') }} :
124- # LinuxContainerImage: 'onebranch.azurecr.io/linux/ubuntu-2204:latest'
124+ # LinuxContainerImage: 'mcr.microsoft.com/onebranch/azurelinux/build:3.0'
125+ LinuxContainerImage : ' onebranch.azurecr.io/linux/ubuntu-2404:latest'
125126 ARCH : amd64
126127 OS : linux
127128 ${{ elseif eq(job_data.job, 'windows_amd64') }} :
129+ LinuxContainerImage : ' mcr.microsoft.com/onebranch/azurelinux/build:3.0'
128130 # LinuxContainerImage: 'onebranch.azurecr.io/linux/ubuntu-2204:latest'
129131 ob_enable_qemu : true
130132 ARCH : amd64
131133 OS : windows
132134 ${{ elseif eq(job_data.job, 'linux_arm64') }} :
135+ LinuxContainerImage : ' mcr.microsoft.com/onebranch/azurelinux/build:3.0'
133136 ob_build_container : true
134137 ARCH : arm64
135138 OS : linux
You can’t perform that action at this time.
0 commit comments