Merge branch 'master' into develop
# Conflicts: # Package.swift # README.md
This commit is contained in:
commit
18740b3981
|
@ -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
|
|
@ -17,7 +17,7 @@ let package = Package(
|
|||
]),
|
||||
.testTarget(
|
||||
name: "ConfTests",
|
||||
dependencies: ["Conf"]),
|
||||
dependencies: ["Conf"])
|
||||
],
|
||||
swiftLanguageVersions: [.v5]
|
||||
)
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
Config made easy
|
||||
|
||||
[!Build](https://github.com/0111b/Conf/workflows/.github/workflows/main.yml/badge.svg?branch=master)
|
||||

|
||||
[](http://ci.merlin.local/adan/Conf)
|
||||
[](https://developer.apple.com/swift/)
|
||||
|
||||
|
|
Loading…
Reference in New Issue