From 7cd7510eed0183dc66eeb42cf46536c9dc0bb236 Mon Sep 17 00:00:00 2001 From: r3drun3 Date: Tue, 19 Mar 2024 11:23:26 +0100 Subject: [PATCH 1/3] ci(release): add osx x64 arch Signed-off-by: r3drun3 --- .github/workflows/create_github_release.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/create_github_release.yaml b/.github/workflows/create_github_release.yaml index 3e047bfb..3f4533c4 100644 --- a/.github/workflows/create_github_release.yaml +++ b/.github/workflows/create_github_release.yaml @@ -13,9 +13,9 @@ jobs: name: Generate extractor artifacts strategy: matrix: - dotnet-runtime: [linux-x64, linux-arm64, win-x64, osx-arm64] + dotnet-runtime: [linux-x64, linux-arm64, win-x64, osx-arm64, osx-x64] # Dynamically set the runner OS based on the .NET runtime - runs-on: ${{ fromJSON('{"linux-x64":"ubuntu-latest", "linux-arm64":"ubuntu-latest", "win-x64":"windows-latest", "osx-arm64":"macos-latest"}')[matrix.dotnet-runtime] }} + runs-on: ${{ fromJSON('{"linux-x64":"ubuntu-latest", "linux-arm64":"ubuntu-latest", "win-x64":"windows-latest", "osx-arm64":"macos-latest", "osx-x64":"macos-latest"}')[matrix.dotnet-runtime] }} steps: - name: Checkout repository uses: actions/checkout@v3 @@ -59,9 +59,9 @@ jobs: name: Generate publisher artifacts strategy: matrix: - dotnet-runtime: [linux-x64, linux-arm64, win-x64, osx-arm64] + dotnet-runtime: [linux-x64, linux-arm64, win-x64, osx-arm64, osx-x64] # Dynamically set the runner OS based on the .NET runtime - runs-on: ${{ fromJSON('{"linux-x64":"ubuntu-latest", "linux-arm64":"ubuntu-latest", "win-x64":"windows-latest", "osx-arm64":"macos-latest"}')[matrix.dotnet-runtime] }} + runs-on: ${{ fromJSON('{"linux-x64":"ubuntu-latest", "linux-arm64":"ubuntu-latest", "win-x64":"windows-latest", "osx-arm64":"macos-latest", "osx-x64":"macos-latest"}')[matrix.dotnet-runtime] }} steps: - name: Checkout repository uses: actions/checkout@v3 @@ -236,10 +236,12 @@ jobs: ${{github.workspace}}/artifact/extractor.linux-x64 ${{github.workspace}}/artifact/extractor.linux-arm64 ${{github.workspace}}/artifact/extractor.osx-arm64 + ${{github.workspace}}/artifact/extractor.osx-x64 ${{github.workspace}}/artifact/publisher.win-x64.exe ${{github.workspace}}/artifact/publisher.linux-x64 ${{github.workspace}}/artifact/publisher.linux-arm64 ${{github.workspace}}/artifact/publisher.osx-arm64 + ${{github.workspace}}/artifact/publisher.osx-x64 ${{github.workspace}}/artifact/Github.zip ${{github.workspace}}/artifact/Azure_DevOps.zip name: APIOps Toolkit for Azure APIM ${{ github.event.inputs.Release_Version }} From 9b43ce6ca33e6626a5fca5537fe64906e842b2fd Mon Sep 17 00:00:00 2001 From: r3drun3 Date: Tue, 19 Mar 2024 11:47:25 +0100 Subject: [PATCH 2/3] feat(tools): add osx x64 arch Signed-off-by: r3drun3 --- tools/azdo_pipelines/run-extractor.yaml | 3 +++ tools/azdo_pipelines/run-publisher-with-env.yaml | 3 +++ tools/github_workflows/run-extractor.yaml | 3 +++ tools/github_workflows/run-publisher-with-env.yaml | 12 ++++++++++++ 4 files changed, 21 insertions(+) diff --git a/tools/azdo_pipelines/run-extractor.yaml b/tools/azdo_pipelines/run-extractor.yaml index efa6b13d..7b46bfb8 100644 --- a/tools/azdo_pipelines/run-extractor.yaml +++ b/tools/azdo_pipelines/run-extractor.yaml @@ -102,6 +102,9 @@ 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*") { + $extractorFileName = "extractor.osx-x64" + } $uri = "https://github.com/Azure/apiops/releases/download/$(apiops_release_version)/$extractorFileName" $destinationFilePath = Join-Path "$(Agent.TempDirectory)" $extractorFinalFileName diff --git a/tools/azdo_pipelines/run-publisher-with-env.yaml b/tools/azdo_pipelines/run-publisher-with-env.yaml index 526e450e..e9214463 100644 --- a/tools/azdo_pipelines/run-publisher-with-env.yaml +++ b/tools/azdo_pipelines/run-publisher-with-env.yaml @@ -97,6 +97,9 @@ 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*") { + $publisherFileName = "publisher.osx-x64" + } $uri = "https://github.com/Azure/apiops/releases/download/$(apiops_release_version)/$publisherFileName" $destinationFilePath = Join-Path "$(Agent.TempDirectory)" $publisherFinalFileName diff --git a/tools/github_workflows/run-extractor.yaml b/tools/github_workflows/run-extractor.yaml index 9bb4fa8e..b8ce7f3e 100644 --- a/tools/github_workflows/run-extractor.yaml +++ b/tools/github_workflows/run-extractor.yaml @@ -57,6 +57,9 @@ 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*") { + $extractorFileName = "extractor.osx-x64" + } $uri = "https://github.com/Azure/apiops/releases/download/${{ env.apiops_release_version }}/$extractorFileName" $destinationFilePath = Join-Path "${{ runner.temp }}" $extractorFinalFileName diff --git a/tools/github_workflows/run-publisher-with-env.yaml b/tools/github_workflows/run-publisher-with-env.yaml index cef381bb..d1a87b9b 100644 --- a/tools/github_workflows/run-publisher-with-env.yaml +++ b/tools/github_workflows/run-publisher-with-env.yaml @@ -78,6 +78,9 @@ 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*") { + $publisherFileName = "publisher.osx-x64" + } $uri = "https://github.com/Azure/apiops/releases/download/${{ env.apiops_release_version }}/$publisherFileName" $destinationFilePath = Join-Path "${{ runner.temp }}" $publisherFinalFileName @@ -122,6 +125,9 @@ 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*") { + $publisherFileName = "publisher.osx-x64" + } $uri = "https://github.com/Azure/apiops/releases/download/${{ env.apiops_release_version }}/$publisherFileName" $destinationFilePath = Join-Path "${{ runner.temp }}" $publisherFinalFileName @@ -168,6 +174,9 @@ 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*") { + $publisherFileName = "publisher.osx-x64" + } $uri = "https://github.com/Azure/apiops/releases/download/${{ env.apiops_release_version }}/$publisherFileName" $destinationFilePath = Join-Path "${{ runner.temp }}" $publisherFinalFileName @@ -213,6 +222,9 @@ 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*") { + $publisherFileName = "publisher.osx-x64" + } $uri = "https://github.com/Azure/apiops/releases/download/${{ env.apiops_release_version }}/$publisherFileName" $destinationFilePath = Join-Path "${{ runner.temp }}" $publisherFinalFileName From 3ecbc07868997e276d3619eed4fea84528038bb1 Mon Sep 17 00:00:00 2001 From: r3drun3 Date: Tue, 19 Mar 2024 11:53:38 +0100 Subject: [PATCH 3/3] 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" }