From 1938d516c0a8b155b9caadf13aad239d78334ff9 Mon Sep 17 00:00:00 2001 From: Gary Verhaegen Date: Mon, 11 Mar 2024 23:58:00 +0100 Subject: [PATCH] [release] try to fix 2.x arm again (#18710) --- ci/split-release-job.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ci/split-release-job.yml b/ci/split-release-job.yml index 2b73f86777..0dc4ad7147 100644 --- a/ci/split-release-job.yml +++ b/ci/split-release-job.yml @@ -34,11 +34,10 @@ jobs: echo "Setting '$1' to '$2'" echo "##vso[task.setvariable variable=$1]$2" } - if ([ "$(uname -m)" = "aarch64" ] || [ "$(uname -m)" = "arm64" ]) \ - && ([ "$major" = "2" ] && [ "$minor" -lt "9" ]); then - setvar skip true + if [ "$major" = "2" ] && [ "$minor" -lt "9" ]; then + setvar skip_arm true else - setvar skip false + setvar skip_arm false fi - task: DownloadPipelineArtifact@0 inputs: @@ -50,7 +49,7 @@ jobs: artifactName: linux-arm-release targetPath: $(Build.StagingDirectory)/release-artifacts condition: and(succeeded(), - not(eq(variables.skip, 'true')), + not(eq(variables.skip_arm, 'true')), not(eq(variables['skip-github'], 'TRUE'))) - task: DownloadPipelineArtifact@0 inputs: