From 420150ef1e32ba17851cd73adc49cebfefd55331 Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Mon, 28 Oct 2024 13:30:39 -0700 Subject: [PATCH] fix use of $architecture variable in build script --- .pipelines/DSC-Official.yml | 2 +- build.ps1 | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.pipelines/DSC-Official.yml b/.pipelines/DSC-Official.yml index 8ef74b68..3bc4351a 100644 --- a/.pipelines/DSC-Official.yml +++ b/.pipelines/DSC-Official.yml @@ -5,7 +5,7 @@ pr: branches: include: - onebranch - - v3.* + - release/v* schedules: - cron: '0 3 * * 1' diff --git a/build.ps1 b/build.ps1 index 9cc8b4b1..680e9048 100644 --- a/build.ps1 +++ b/build.ps1 @@ -661,13 +661,15 @@ if ($packageType -eq 'msixbundle') { } # for Linux, we only build musl as its statically linked, so we remove the musl suffix - if ($architecture -eq 'aarch64-unknown-linux-musl') { - $architecture = 'aarch64-linux' + $productArchitecture = if ($architecture -eq 'aarch64-unknown-linux-musl') { + 'aarch64-linux' } elseif ($architecture -eq 'x86_64-unknown-linux-musl') { - $architecture = 'x86_64-linux' + 'x86_64-linux' + } else { + $architecture } - $packageName = "DSC-$productVersion-$architecture.tar" + $packageName = "DSC-$productVersion-$productArchitecture.tar" $tarFile = Join-Path $PSScriptRoot 'bin' $packageName tar cvf $tarFile -C $tgzTarget . if ($LASTEXITCODE -ne 0) {