Tweaked config

abbeycode · Jul 13, 2021 · 7802135 · 7802135
1 parent 8dfde2a
commit 7802135
Showing 1 changed file with 23 additions and 19 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,69 +7,73 @@ executors:
 
 workflows:
   version: 2
-  Test:
+  test-validate-release:
     jobs:
+      # Testing
       - test-Mac
       - test-iOS
       - test-ExampleApp
-  Validate:
-    jobs:
+
+      # Validation
       - validate-CocoaPods
-#          requires:
-#            - test-Mac
-#            - test-iOS
-#            - test-ExampleApp
+         requires:
+           - test-Mac
+           - test-iOS
+           - test-ExampleApp
       - validate-Carthage
-#          requires:
-#            - test-Mac
-#            - test-iOS
-#            - test-ExampleApp
-  Release:
-    jobs:
+         requires:
+           - test-Mac
+           - test-iOS
+           - test-ExampleApp
+
+      # Release
       - release:
           # Only run for tags
           filters:
             branches:
               ignore: /.*/
             tags:
               only: /.*/
-#          requires:
-#            - validate-CocoaPods
-#            - validate-Carthage
+         requires:
+           - validate-CocoaPods
+           - validate-Carthage
 
 jobs:
   test-Mac:
     executor: my-xcode
     steps:
-#          - checkout
+      - 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:
     executor: my-xcode
     steps:
-#          - checkout
+      - 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:
     executor: my-xcode
     steps:
-#          - checkout
+      - 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:
     executor: my-xcode
     steps:
+      - checkout
       - run: ./Scripts/cocoapod-validate.sh
 
   validate-Carthage:
     executor: my-xcode
     steps:
+      - checkout
       - run: ./Scripts/carthage-validate.sh
 
   release:
     executor: my-xcode
     steps:
+      - checkout
       - run: ./Scripts/push-output.sh