refactor executors in circleci config

jjochen · Mar 16, 2020 · 1f6d9cd · 1f6d9cd
1 parent 2ee115c
commit 1f6d9cd
Showing 1 changed file with 31 additions and 25 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,45 +2,51 @@ version: 2.1
 
 executors:
 
-  default: &default
+  simulator:
+    parameters:
+      xcode: 
+        type: string
+        default: 11.3.1
+      os:
+        type: string
+        default: 13.3
+      device:
+        type: string
+        default: iPhone 11 Pro Max
     macos:
-      xcode: 11.3.1
+      xcode: << parameters.xcode >>
     shell: /bin/bash --login -eo pipefail
+    environment:
+      SIMULATOR_OS: << parameters.os >>
+      DESTINATION: platform=iOS Simulator,OS=<< parameters.os >>,name=<< parameters.device >>
+      SIMULATOR: << parameters.device >> (<< parameters.os >>) [
+
+  default:
+    simulator
 
   ios13-iphone-11-pro-max:
-    <<: *default
-    macos:
+    simulator:
       xcode: 11.3.1
-    environment:
-      SIMULATOR_OS: 13.3
-      DESTINATION: platform=iOS Simulator,OS=13.3,name=iPhone 11 Pro Max
-      SIMULATOR: iPhone 11 Pro Max (13.3) [
+      os: 13.3
+      device: iPhone 11 Pro Max
 
   ios12-iphone-xs-max:
-    <<: *default
-    macos:
+    simulator:
       xcode: 10.3.0
-    environment:
-      SIMULATOR_OS: 12.4
-      DESTINATION: platform=iOS Simulator,OS=12.4,name=iPhone Xs Max
-      SIMULATOR: iPhone Xs Max (12.4) [
+      os: 12.4
+      device: iPhone Xs Max
 
   ios11-iphone-x:
-    <<: *default
-    macos:
+    simulator:
       xcode: 10.3.0
-    environment:
-      DESTINATION: platform=iOS Simulator,OS=11.2,name=iPhone X
-      SIMULATOR: iPhone X (11.2) [
+      os: 11.2
+      device: iPhone X
 
   ios10-iphone-7:
-    <<: *default
-    macos:
+    simulator:
       xcode: 10.3.0
-    shell: /bin/bash --login -eo pipefail
-    environment:
-      DESTINATION: platform=iOS Simulator,OS=10.3.1,name=iPhone 7
-      SIMULATOR: iPhone 7 (10.3.1) [
+      os: 10.3.1
+      device: iPhone 7
 
 
 commands: