Skip to content

Commit cd07f4c

Browse files
authored
ci: Fixing build pipeline for 1.6 release (#3859)
Fixing build pipeline for 1.6 release
1 parent b620f4d commit cd07f4c

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

.pipelines/build/generate-manifest.steps.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ steps:
1212
.args = [ (.platform | split("/")[0]), (.platform | split("/")[1]) ] |
1313
.args = [ ("--os " + .args[0] ), ("--arch " + .args[1] ) ] |
1414
if .osVersion then .args += ["--os-version " + .osVersion] else . end |
15-
{ image: .imageReference, annotate: .args }' | \
15+
{ image: .imageReference, annotate: (.args | join(" ")) }' | \
1616
jq -rcs)
1717
echo >&2 "##vso[task.setvariable variable=MANIFEST_JSON;isOutput=true]$MANIFEST_DATA"
1818
echo "$MANIFEST_DATA" | jq -r .

.pipelines/build/image.steps.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ parameters:
3333
default:
3434
- "--target $(os) "
3535
- "--platform $(os)/$(arch) "
36+
- "--provenance false "
3637

3738
- name: common_build_args
3839
type: object

.pipelines/build/images.jobs.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ jobs:
112112
pool:
113113
os: linux
114114
type: docker
115-
# ${{ if eq(job_data.job, 'linux_arm64') }}:
116-
# hostArchitecture: arm64
115+
${{ if eq(job_data.job, 'linux_arm64') }}:
116+
hostArchitecture: arm64
117117
# ${{ else }}:
118118
# LinuxHostVersion: 'AzLinux3.0AMD64'
119119
variables:
@@ -127,12 +127,10 @@ jobs:
127127
OS: linux
128128
${{ elseif eq(job_data.job, 'windows_amd64') }}:
129129
LinuxContainerImage: 'mcr.microsoft.com/onebranch/azurelinux/build:3.0'
130-
ob_enable_qemu: true
131130
ARCH: amd64
132131
OS: windows
133132
${{ elseif eq(job_data.job, 'linux_arm64') }}:
134133
LinuxContainerImage: 'mcr.microsoft.com/onebranch/azurelinux/build:3.0'
135-
ob_enable_qemu: true
136134
ARCH: arm64
137135
OS: linux
138136
GOARCH: arm64

0 commit comments

Comments
 (0)