Tweaked workflows

abbeycode · Jul 13, 2021 · 5081ce3 · 5081ce3
1 parent bc06212
commit 5081ce3
Showing 1 changed file with 53 additions and 37 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,55 +4,71 @@ macos:
   xcode: 12.5.1
 
 workflows:
+  version: 2
   Test:
     jobs:
-      - test-Mac:
-          steps:
-  #          - checkout
-            # The CLANG arguments and find command fail the build on analyzer errors
-            - run: xcodebuild -workspace UnrarKit.xcworkspace -scheme UnrarKit -sdk macosx -configuration Release -quiet analyze test CLANG_ANALYZER_OUTPUT=html CLANG_ANALYZER_OUTPUT_DIR=analyzer-output && [[ -z `find analyzer-output -name "*.html"` ]]
-
-      - test-iOS:
-          steps:
-  #          - checkout
-            # The CLANG arguments and find command fail the build on analyzer errors
-            - run: xcodebuild -workspace UnrarKit.xcworkspace -scheme UnrarKit -destination 'platform=iOS Simulator,name=iPhone 11,OS=latest' -configuration Release analyze test CLANG_ANALYZER_OUTPUT=html CLANG_ANALYZER_OUTPUT_DIR=analyzer-output && [[ -z `find analyzer-output -name "*.html"` ]]
-
-      - test-ExampleApp:
-          steps:
-  #          - checkout
-            # The CLANG arguments and find command fail the build on analyzer errors
-            - run: xcodebuild -workspace UnrarKit.xcworkspace -scheme UnrarExample -sdk iphonesimulator -configuration Release analyze CLANG_ANALYZER_OUTPUT=html CLANG_ANALYZER_OUTPUT_DIR=analyzer-output && [[ -z `find analyzer-output -name "*.html"` ]]
-
+      - test-Mac
+      - test-iOS
+      - test-ExampleApp
   Validate:
     jobs:
-      - validate-CocoaPods:
+      - validate-CocoaPods
           requires:
             - test-Mac
             - test-iOS
             - test-ExampleApp
-          steps:
-            - run: ./Scripts/cocoapod-validate.sh
-
-      - validate-Carthage:
+      - validate-Carthage
           requires:
             - test-Mac
             - test-iOS
             - test-ExampleApp
-          steps:
-            - run: ./Scripts/carthage-validate.sh
-
   Release:
     jobs:
-      - release:
+      - release
           requires:
-            - validate-CocoaPods
-            - validate-Carthage
-          # Only run for tags
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /.*/
-          steps:
-            - run: ./Scripts/push-output.sh
+        - validate-CocoaPods
+        - validate-Carthage
+
+jobs:
+  - test-Mac:
+      steps:
+#          - checkout
+        # The CLANG arguments and find command fail the build on analyzer errors
+        - run: xcodebuild -workspace UnrarKit.xcworkspace -scheme UnrarKit -sdk macosx -configuration Release -quiet analyze test CLANG_ANALYZER_OUTPUT=html CLANG_ANALYZER_OUTPUT_DIR=analyzer-output && [[ -z `find analyzer-output -name "*.html"` ]]
+
+  - test-iOS:
+      steps:
+#          - checkout
+        # The CLANG arguments and find command fail the build on analyzer errors
+        - run: xcodebuild -workspace UnrarKit.xcworkspace -scheme UnrarKit -destination 'platform=iOS Simulator,name=iPhone 11,OS=latest' -configuration Release analyze test CLANG_ANALYZER_OUTPUT=html CLANG_ANALYZER_OUTPUT_DIR=analyzer-output && [[ -z `find analyzer-output -name "*.html"` ]]
+
+  - test-ExampleApp:
+      steps:
+#          - checkout
+        # The CLANG arguments and find command fail the build on analyzer errors
+        - run: xcodebuild -workspace UnrarKit.xcworkspace -scheme UnrarExample -sdk iphonesimulator -configuration Release analyze CLANG_ANALYZER_OUTPUT=html CLANG_ANALYZER_OUTPUT_DIR=analyzer-output && [[ -z `find analyzer-output -name "*.html"` ]]
+
+  - validate-CocoaPods:
+      requires:
+        - test-Mac
+        - test-iOS
+        - test-ExampleApp
+      steps:
+        - run: ./Scripts/cocoapod-validate.sh
+
+  - validate-Carthage:
+      steps:
+        - run: ./Scripts/carthage-validate.sh
+
+  - release:
+      requires:
+        - validate-CocoaPods
+        - validate-Carthage
+      # Only run for tags
+      filters:
+        branches:
+          ignore: /.*/
+        tags:
+          only: /.*/
+      steps:
+        - run: ./Scripts/push-output.sh