Merge pull request #507 from R3DRUN3/main

ci(release): add osx x64 arch
Azure · Mar 19, 2024 · 7b01129 · 7b01129
2 parents c36a7f7 + 3ecbc07
commit 7b01129
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 4 deletions.
diff --git 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 }}

diff --git 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 "*x86_64*") {
+                  $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
@@ -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 "*x86_64*") {
+          $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
@@ -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 "*x86_64*") {
+            $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
@@ -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 "*x86_64*") {
+            $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:
           elseif("${{ runner.os }}" -like "*mac*" -and "${{ runner.arch }}" -like "*arm*"){
             $publisherFileName = "publisher.osx-arm64"
           }
+          elseif ("${{ runner.os }}" -like "*mac*" -and "${{ runner.arch }}" -like "*x86_64*") {
+            $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:
           elseif("${{ runner.os }}" -like "*mac*" -and "${{ runner.arch }}" -like "*arm*"){
             $publisherFileName = "publisher.osx-arm64"
           }
+          elseif ("${{ runner.os }}" -like "*mac*" -and "${{ runner.arch }}" -like "*x86_64*") {
+            $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:
           elseif("${{ runner.os }}" -like "*mac*" -and "${{ runner.arch }}" -like "*arm*"){
             $publisherFileName = "publisher.osx-arm64"
           }
+          elseif ("${{ runner.os }}" -like "*mac*" -and "${{ runner.arch }}" -like "*x86_64*") {
+            $publisherFileName = "publisher.osx-x64"
+          }
           
           $uri = "https://github.com/Azure/apiops/releases/download/${{ env.apiops_release_version }}/$publisherFileName"
           $destinationFilePath = Join-Path "${{ runner.temp }}" $publisherFinalFileName