From 1e1702cea5a084d2198ac781236510fddd7e1d5f Mon Sep 17 00:00:00 2001
From: PeterSchafer <101886095+PeterSchafer@users.noreply.github.com>
Date: Mon, 2 Oct 2023 18:23:53 +0200
Subject: [PATCH] revert: replace deprecated macos circleci runner [HEAD-781]
 (#4884) (#4891)

This reverts commit b25f3a941ebe5babca5e5925640748dbd369f93a.
---
 .circleci/config.yml | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index caa25deff5..b2ef64cc45 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -86,11 +86,16 @@ executors:
       - image: ubuntu:focal
     working_directory: /mnt/ramdisk/snyk
     resource_class: arm.medium
+  macos-amd64:
+    macos:
+      # https://circleci.com/docs/2.0/testing-ios/#supported-xcode-versions
+      xcode: '14.3.1'
+    resource_class: macos.x86.medium.gen2
   macos-arm64:
     macos:
       # https://circleci.com/docs/2.0/testing-ios/#supported-xcode-versions
       xcode: '14.3.1'
-    resource_class: macos.m1.medium.gen1
+    resource_class: macos.m1.large.gen1
   win-server2022-amd64:
     machine:
       image: windows-server-2022-gui:2023.07.1
@@ -274,9 +279,6 @@ commands:
         type: string
         default: go gradle python elixir composer gradle@6 maven sbt dotnet
     steps:
-      - run:
-          name: Installing Rosetta
-          command: softwareupdate --install-rosetta --agree-to-license
       - restore_cache:
           key: acceptance-tests-macos-<< parameters.items >>
       - run:
@@ -296,9 +298,6 @@ commands:
         type: string
         default: go gradle python elixir composer gradle@6 maven sbt dotnet
     steps:
-      - run:
-          name: Installing Rosetta
-          command: softwareupdate --install-rosetta --agree-to-license
       - install-deps-python:
           os: macos
 
@@ -410,7 +409,7 @@ workflows:
           go_os: darwin
           go_arch: amd64
           go_download_base_url: << pipeline.parameters.go_download_base_url >>
-          executor: macos-arm64
+          executor: macos-amd64
           install_deps_extension: macos-build
           requires:
             - prepare-build
@@ -504,7 +503,7 @@ workflows:
               ignore: master
           requires:
             - build macOS amd64
-          executor: macos-arm64
+          executor: macos-amd64
           test_snyk_command: ./binary-releases/snyk-macos
           install_deps_extension: macos-full
 
@@ -547,7 +546,7 @@ workflows:
             - build macOS amd64
           go_os: darwin
           go_arch: amd64
-          executor: macos-arm64
+          executor: macos-amd64
           install_deps_extension: noop
           filters:
             branches:
@@ -601,7 +600,7 @@ workflows:
               executor:
                 - 'docker-amd64'
                 - 'win-server2019-amd64'
-                - 'macos-arm64'
+                - 'macos-amd64'
           requires:
             - upload version
           filters:
@@ -620,7 +619,7 @@ workflows:
                 - 'docker-arm64'
                 - 'win-server2019-amd64'
                 - 'win-server2022-amd64'
-                - 'macos-arm64'
+                - 'macos-amd64'
                 - 'linux-ubuntu-latest-amd64'
                 - 'linux-ubuntu-mantic-amd64'
                 - 'linux-ubuntu-jammy-amd64'
@@ -674,12 +673,12 @@ workflows:
           requires:
             - Validate NPM artifacts (docker-amd64)
             - Validate NPM artifacts (win-server2019-amd64)
-            - Validate NPM artifacts (macos-arm64)
+            - Validate NPM artifacts (macos-amd64)
             - e2e tests (docker-amd64)
             - e2e tests (docker-arm64)
             - e2e tests (win-server2019-amd64)
             - e2e tests (win-server2022-amd64)
-            - e2e tests (macos-arm64)
+            - e2e tests (macos-amd64)
             - e2e tests (linux-ubuntu-latest-amd64)
             - e2e tests (linux-ubuntu-mantic-amd64)
             - e2e tests (linux-ubuntu-jammy-amd64)