Update CircleCI config

ml-archive · May 2, 2019 · ea9796a · ea9796a
1 parent a7ffcba
commit ea9796a
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,53 +2,55 @@ version: 2
 jobs:
   MacOS:
     macos:
-      xcode: "9.0"
+      xcode: "10.0.0"
     steps:
       - checkout
       - restore_cache:
           keys:
-            - v1-spm-deps-{{ checksum "Package.swift" }}
+            - v2-spm-deps-{{ checksum "Package.swift" }}
       - run:
-          name: Install CMySQL and CTLS
+          name: Install dependencies
           command: |
             brew tap vapor/homebrew-tap
             brew install cmysql
             brew install ctls
+            brew install libressl
+            brew install cstack
       - run:
           name: Build and Run Tests
           no_output_timeout: 1800
           command: |
-            swift package generate-xcodeproj --enable-code-coverage    
+            swift package generate-xcodeproj --enable-code-coverage
             xcodebuild -scheme Gatekeeper-Package -enableCodeCoverage YES test | xcpretty
       - run:
           name: Report coverage to Codecov
           command: |
             bash <(curl -s https://codecov.io/bash)
       - save_cache:
-          key: v1-spm-deps-{{ checksum "Package.swift" }}
+          key: v2-spm-deps-{{ checksum "Package.swift" }}
           paths:
             - .build
   Linux:
     docker:
-      - image: brettrtoomey/vapor-ci:0.0.1
+      - image: nodesvapor/vapor-ci:swift-4.2
     steps:
       - checkout
       - restore_cache:
           keys:
-            - v2-spm-deps-{{ checksum "Package.swift" }}
+            - v2l-spm-deps-{{ checksum "Package.swift" }}
       - run:
-          name: Copy Package file
+          name: Copy Package File
           command: cp Package.swift res
       - run:
           name: Build and Run Tests
           no_output_timeout: 1800
           command: |
             swift test -Xswiftc -DNOJSON
       - run:
-          name: Restoring Package file
+          name: Restoring Package File
           command: mv res Package.swift
       - save_cache:
-          key: v2-spm-deps-{{ checksum "Package.swift" }}
+          key: v2l-spm-deps-{{ checksum "Package.swift" }}
           paths:
             - .build
 workflows:
@@ -62,4 +64,4 @@ experimental:
     branches:
       only:
         - master
-        - develop
+        - develop