From 1fc31be6b66245187c3f87f35d86b6aeac6dfe7f Mon Sep 17 00:00:00 2001 From: Eneko Alonso Date: Sun, 14 Oct 2018 08:45:11 -0700 Subject: [PATCH] Prepare for release 0.5.0 (#4) Changes: - Remove .swift-version - Test multiple versions of Swift on Travis CI (4.1, 4.1.2, 4.2) --- .swift-version | 1 - .travis.yml | 73 +++++++++++++++++++++++++++++++++----------------- README.md | 2 +- 3 files changed, 50 insertions(+), 26 deletions(-) delete mode 100644 .swift-version diff --git a/.swift-version b/.swift-version deleted file mode 100644 index 5186d07..0000000 --- a/.swift-version +++ /dev/null @@ -1 +0,0 @@ -4.0 diff --git a/.travis.yml b/.travis.yml index f6573db..88eedc9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,30 +1,55 @@ language: generic -matrix: +jobs: include: - - os: linux + - stage: Continuous Integration + name: Linux Swift 4.1 + os: linux dist: trusty sudo: required - - os: osx + install: + - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)" + - swiftenv install 4.1 + - swiftenv local 4.1 + - swift --version + script: + - swift test --parallel + - stage: Continuous Integration + name: Linux Swift 4.2 + os: linux + dist: trusty + sudo: required + install: + - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)" + - swiftenv install 4.2 + - swiftenv local 4.2 + - swift --version + script: + - swift test --parallel + - stage: Continuous Integration + name: macOS Swift 4.1 + os: osx osx_image: xcode9.3 - -install: - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"; - swiftenv install 4.1; - swiftenv local 4.1; - fi - - swift --version - -script: - - swift test --parallel - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - swift package generate-xcodeproj --enable-code-coverage; - xcodebuild -scheme MarkdownGenerator-Package test; - fi - -after_success: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - bash <(curl -s https://codecov.io/bash); - fi - + script: + - swift test --parallel + - stage: Continuous Integration + name: macOS Swift 4.1.2 + os: osx + osx_image: xcode9.4 + script: + - swift test --parallel + - stage: Continuous Integration + name: macOS Swift 4.2 + os: osx + osx_image: xcode10 + script: + - swift test --parallel + - stage: Continuous Integration + name: Code Coverage (Swift 4.1) + os: osx + osx_image: xcode9.3 + script: + - swift package generate-xcodeproj --enable-code-coverage + - xcodebuild -scheme MarkdownGenerator-Package test + after_success: + - bash <(curl -s https://codecov.io/bash) diff --git a/README.md b/README.md index c28f145..d12f98b 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ![Release](https://img.shields.io/github/release/eneko/markdowngenerator.svg) -![Swift 4.2](https://img.shields.io/badge/Swift-4.2-orange.svg) +![Swift 4.1](https://img.shields.io/badge/Swift-4.1-orange.svg) [![Build Status](https://travis-ci.org/eneko/MarkdownGenerator.svg?branch=master)](https://travis-ci.org/eneko/MarkdownGenerator) [![codecov](https://codecov.io/gh/eneko/MarkdownGenerator/branch/master/graph/badge.svg)](https://codecov.io/gh/eneko/MarkdownGenerator) [![Swift Package Manager Compatible](https://img.shields.io/badge/spm-compatible-brightgreen.svg)](https://swift.org/package-manager)