Merge branch 'master' into develop

# Conflicts:
#	Package.swift
#	README.md
This commit is contained in:
Alexandr Goncharov 2020-06-24 21:06:29 +03:00
commit 18740b3981
3 changed files with 48 additions and 2 deletions

46
.github/workflows/build.yml vendored Normal file
View File

@ -0,0 +1,46 @@
name: CI
on:
push:
branches:
- master
- develop
pull_request:
branches:
- master
jobs:
SwiftLint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: GitHub Action for SwiftLint with --strict
uses: norio-nomura/action-swiftlint@3.1.0
with:
args: --strict
Xcode:
strategy:
matrix:
xcode_version: ['11.4']
runs-on: macos-latest
env:
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode_version }}.app
steps:
- uses: actions/checkout@v2
- run: swift -version
- run: swift package clean
- run: swift test -v --enable-code-coverage
Linux:
strategy:
matrix:
tag: ['5.2']
runs-on: ubuntu-latest
container:
image: swift:${{ matrix.tag }}
steps:
- uses: actions/checkout@v2
- run: swift package clean
- run: swift test -v --enable-test-discovery --enable-code-coverage
- uses: mattpolzin/swift-codecov-action@0.4.0

View File

@ -17,7 +17,7 @@ let package = Package(
]),
.testTarget(
name: "ConfTests",
dependencies: ["Conf"]),
dependencies: ["Conf"])
],
swiftLanguageVersions: [.v5]
)

View File

@ -2,7 +2,7 @@
Config made easy
[!Build](https://github.com/0111b/Conf/workflows/.github/workflows/main.yml/badge.svg?branch=master)
![CI](https://github.com/0111b/Conf/workflows/CI/badge.svg)
[![Build Status](http://ci.merlin.local/api/badges/adan/Conf/status.svg)](http://ci.merlin.local/adan/Conf)
[![Swift 5](https://img.shields.io/badge/Swift-5-orange.svg?style=flat)](https://developer.apple.com/swift/)