Update CI config

.circleci/config.yml

@@ -1,109 +1,92 @@
-version: 2
-jobs:
-  build:
-    macos:
-      xcode: "14.2.0"
-
+version: 2.1
+
+commands:
+  run_solidity_formula:
+    description: "Run Solidity homebrew formula"
+    parameters:
+      version:
+        type: string
+        default: "latest"
+      formula:
+        type: string
+        default: "solidity"
     steps:
       - checkout
-
       - run:
-          name: Install Solidity
+          name: Install Solidity << parameters.version >>
           command: |
             brew update
-            brew upgrade
-            #brew tap ethereum/ethereum # Acutally we should use the rule from the pull request
-            brew install ./solidity.rb
+            # brew tap ethereum/ethereum # Actually we should use the rule from the pull request
+            brew install ./<< parameters.formula >>.rb
           no_output_timeout: 30m
 
       - run:
           name: Test Formula
-          command: brew test solidity.rb
+          command: brew test << parameters.formula >>
 
       - run:
           name: Test Solidity
           command: solc --version
 
       - run:
           name: Cleanup
-          command: brew uninstall boost cmake ccache solidity
-
-      - run:
-          name: Install Solidity 0.7
-          command: |
-            brew update
-            #brew tap ethereum/ethereum # Acutally we should use the rule from the pull request
-            brew install ./solidity@7.rb
-          no_output_timeout: 30m
-
-      - run:
-          name: Test Formula
-          command: brew test solidity@7
-
-      - run:
-          name: Test Solidity
-          command: solc --version
-
-      - run:
-          name: Cleanup
-          command: brew uninstall boost cmake ccache solidity@7
-
-      - run:
-          name: Install Solidity 0.6
-          command: |
-            brew update
-            #brew tap ethereum/ethereum # Acutally we should use the rule from the pull request
-            brew install ./solidity@6.rb
-          no_output_timeout: 30m
-
-      - run:
-          name: Test Formula
-          command: brew test solidity@6
-
-      - run:
-          name: Test Solidity
-          command: solc --version
-
-      - run:
-          name: Cleanup
-          command: brew uninstall boost cmake ccache solidity@6
-
-      - run:
-          name: Install Solidity 0.5
-          command: |
-            brew update
-            #brew tap ethereum/ethereum # Acutally we should use the rule from the pull request
-            brew install ./solidity@5.rb
-          no_output_timeout: 30m
+          command: brew uninstall boost cmake ccache << parameters.formula >>
 
-      - run:
-          name: Test Formula
-          command: brew test solidity@5
-
-      - run:
-          name: Test Solidity
-          command: solc --version
+jobs:
+  solidity_latest: &solidity_latest
+    macos:
+      xcode: 14.2.0
+    steps:
+      - run_solidity_formula:
+          version: "0.8"
+          formula: "solidity"
 
-      - run:
-          name: Cleanup
-          command: brew uninstall boost cmake ccache solidity@5
+  solidity_7: &solidity_7
+    macos:
+      xcode: 12.5.1
+    steps:
+      - run_solidity_formula:
+          version: "0.7"
+          formula: "solidity@7"
 
-      - run:
-          name: Install Solidity 0.4
-          command: |
-            brew update
-            #brew tap ethereum/ethereum # Acutally we should use the rule from the pull request
-            brew install ./solidity@4.rb
-          no_output_timeout: 30m
+  solidity_6: &solidity_6
+    macos:
+      xcode: 12.5.1
+    steps:
+      - run_solidity_formula:
+          version: "0.6"
+          formula: "solidity@6"
 
-      - run:
-          name: Test Formula
-          command: brew test solidity@4
+  solidity_5: &solidity_5
+    macos:
+      xcode: 12.5.1
+    steps:
+      - run_solidity_formula:
+          version: "0.5"
+          formula: "solidity@5"
 
-      - run:
-          name: Test Solidity
-          command: solc --version
+  solidity_4: &solidity_4
+    macos:
+      xcode: 12.5.1
+    steps:
+      - run_solidity_formula:
+          version: "0.4"
+          formula: "solidity@4"
 
+  geth: &geth
+    macos:
+      xcode: 14.2.0
+    steps:
       - run:
           name: Install geth
           command: brew install ./ethereum.rb
+
+workflows:
+  main:
+    jobs:
+      - solidity_latest
+      - solidity_7
+      - solidity_6
+      - solidity_5
+      - solidity_4
+      - geth