From 3ecbc07868997e276d3619eed4fea84528038bb1 Mon Sep 17 00:00:00 2001 From: r3drun3 Date: Tue, 19 Mar 2024 11:53:38 +0100 Subject: [PATCH] fix(tools): osx x64 arch string Signed-off-by: r3drun3 --- tools/azdo_pipelines/run-extractor.yaml | 2 +- tools/azdo_pipelines/run-publisher-with-env.yaml | 2 +- tools/github_workflows/run-extractor.yaml | 2 +- tools/github_workflows/run-publisher-with-env.yaml | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/azdo_pipelines/run-extractor.yaml b/tools/azdo_pipelines/run-extractor.yaml index 7b46bfb8..4cd7fe09 100644 --- a/tools/azdo_pipelines/run-extractor.yaml +++ b/tools/azdo_pipelines/run-extractor.yaml @@ -102,7 +102,7 @@ stages: elseif ("$(Agent.OS)" -like "*mac*" -and "$(Agent.OSArchitecture)" -like "*arm*") { $extractorFileName = "extractor.osx-arm64" } - elseif ("$(Agent.OS)" -like "*mac*" -and "$(Agent.OSArchitecture)" -like "*x64*") { + elseif ("$(Agent.OS)" -like "*mac*" -and "$(Agent.OSArchitecture)" -like "*x86_64*") { $extractorFileName = "extractor.osx-x64" } diff --git a/tools/azdo_pipelines/run-publisher-with-env.yaml b/tools/azdo_pipelines/run-publisher-with-env.yaml index e9214463..e8e846df 100644 --- a/tools/azdo_pipelines/run-publisher-with-env.yaml +++ b/tools/azdo_pipelines/run-publisher-with-env.yaml @@ -97,7 +97,7 @@ steps: elseif ("$(Agent.OS)" -like "*mac*" -and "$(Agent.OSArchitecture)" -like "*arm*") { $publisherFileName = "publisher.osx-arm64" } - elseif ("$(Agent.OS)" -like "*mac*" -and "$(Agent.OSArchitecture)" -like "*x64*") { + elseif ("$(Agent.OS)" -like "*mac*" -and "$(Agent.OSArchitecture)" -like "*x86_64*") { $publisherFileName = "publisher.osx-x64" } diff --git a/tools/github_workflows/run-extractor.yaml b/tools/github_workflows/run-extractor.yaml index b8ce7f3e..6b1a9411 100644 --- a/tools/github_workflows/run-extractor.yaml +++ b/tools/github_workflows/run-extractor.yaml @@ -57,7 +57,7 @@ jobs: elseif ("${{ runner.os }}" -like "*mac*" -and "${{ runner.arch }}" -like "*arm*") { $extractorFileName = "extractor.osx-arm64" } - elseif ("${{ runner.os }}" -like "*mac*" -and "${{ runner.arch }}" -like "*x64*") { + elseif ("${{ runner.os }}" -like "*mac*" -and "${{ runner.arch }}" -like "*x86_64*") { $extractorFileName = "extractor.osx-x64" } diff --git a/tools/github_workflows/run-publisher-with-env.yaml b/tools/github_workflows/run-publisher-with-env.yaml index d1a87b9b..42e1f4c2 100644 --- a/tools/github_workflows/run-publisher-with-env.yaml +++ b/tools/github_workflows/run-publisher-with-env.yaml @@ -78,7 +78,7 @@ jobs: elseif ("${{ runner.os }}" -like "*mac*" -and "${{ runner.arch }}" -like "*arm*") { $publisherFileName = "publisher.osx-arm64" } - elseif ("${{ runner.os }}" -like "*mac*" -and "${{ runner.arch }}" -like "*x64*") { + elseif ("${{ runner.os }}" -like "*mac*" -and "${{ runner.arch }}" -like "*x86_64*") { $publisherFileName = "publisher.osx-x64" } @@ -125,7 +125,7 @@ jobs: else if("${{ runner.os }}" -like "*mac*" && "${{ runner.arch }}" -like "*arm*"){ $publisherFileName = "publisher.osx-arm64" } - elseif ("${{ runner.os }}" -like "*mac*" -and "${{ runner.arch }}" -like "*x64*") { + elseif ("${{ runner.os }}" -like "*mac*" -and "${{ runner.arch }}" -like "*x86_64*") { $publisherFileName = "publisher.osx-x64" } @@ -174,7 +174,7 @@ jobs: else if("${{ runner.os }}" -like "*mac*" && "${{ runner.arch }}" -like "*arm*"){ $publisherFileName = "publisher.osx-arm64" } - elseif ("${{ runner.os }}" -like "*mac*" -and "${{ runner.arch }}" -like "*x64*") { + elseif ("${{ runner.os }}" -like "*mac*" -and "${{ runner.arch }}" -like "*x86_64*") { $publisherFileName = "publisher.osx-x64" } @@ -222,7 +222,7 @@ jobs: else if("${{ runner.os }}" -like "*mac*" && "${{ runner.arch }}" -like "*arm*"){ $publisherFileName = "publisher.osx-arm64" } - elseif ("${{ runner.os }}" -like "*mac*" -and "${{ runner.arch }}" -like "*x64*") { + elseif ("${{ runner.os }}" -like "*mac*" -and "${{ runner.arch }}" -like "*x86_64*") { $publisherFileName = "publisher.osx-x64" }