Merge pull request #771 from Quick/tweak-ci

Tweak CI
Quick · May 22, 2020 · 8c2103e · 8c2103e
2 parents ca652f9 + 2a6a71a
commit 8c2103e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,37 +6,39 @@ on:
       - master
   pull_request:
     branches:
-      - '*'
+      - "*"
 
 jobs:
   cocoapods:
     name: CocoaPods Lint
-    runs-on: macOS-latest
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
-      - run: sudo xcode-select -s '/Applications/Xcode_11.4.app'
       - run: gem install bundler:1.17.3 && bundle install
       - run: ./test podspec
-  
+
   xcode:
     name: Xcode ${{ matrix.xcode }} - ${{ matrix.platform }}
-    runs-on: macOS-latest
+    runs-on: macos-latest
     strategy:
       matrix:
         xcode: [11.4.1]
         platform: [macos, ios, tvos, macos_xcodespm, ios_xcodespm]
+      fail-fast: false
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app
     steps:
-    - uses: actions/checkout@v2
-    - run: sudo xcode-select -s '/Applications/Xcode_${{ matrix.xcode }}.app'
-    - run: ./test ${{ matrix.platform }}
+      - uses: actions/checkout@v2
+      - run: ./test ${{ matrix.platform }}
 
   swiftpm_darwin:
     name: SwiftPM, Darwin, Xcode ${{ matrix.xcode }}
-    runs-on: macOS-latest
+    runs-on: macos-latest
     strategy:
       matrix:
         xcode: [11.4.1]
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app
     steps:
-    - uses: actions/checkout@v2
-    - run: sudo xcode-select -s '/Applications/Xcode_${{ matrix.xcode }}.app'
-    - run: ./test swiftpm
+      - uses: actions/checkout@v2
+      - run: ./test swiftpm
diff --git a/.travis.yml b/.travis.yml
@@ -19,22 +19,22 @@ jobs:
     #   osx_image: xcode10.3
     #   script: ./test swiftpm
     - &swiftpm_linux
-      name: SwiftPM / Linux / Swift 5.2.2
+      name: SwiftPM / Linux / Swift 5.2.3
       os: linux
       env:
-        - SWIFT_VERSION=5.2.2
+        - SWIFT_VERSION=5.2.3
       install:
         - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
       script:
         - ./test swiftpm
-    # - <<: *swiftpm_linux
-    #   name: SwiftPM / Linux / Swift 5.3
-    #   env:
-    #     - SWIFT_VERSION=5.3
+    - <<: *swiftpm_linux
+      name: SwiftPM / Linux / Swift 5.3 Development
+      env:
+        - SWIFT_VERSION=5.3-DEVELOPMENT-SNAPSHOT-2020-05-11-a
     - <<: *swiftpm_linux
       name: SwiftPM / Linux / Swift Development
       env:
-        - SWIFT_VERSION=DEVELOPMENT-SNAPSHOT-2020-04-17-a
+        - SWIFT_VERSION=DEVELOPMENT-SNAPSHOT-2020-05-18-a
 install: true
 script:
   - ./test $TYPE