Skip to content

Commit

Permalink
Merge branch 'release/2.1.0'
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
#	package-lock.json
#	package.json
  • Loading branch information
sinoru committed May 28, 2022
2 parents c5d19b4 + 3872663 commit 996c023
Show file tree
Hide file tree
Showing 13 changed files with 8,789 additions and 8,361 deletions.
16 changes: 12 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,21 @@ jobs:
runs-on: ${{ matrix.operating-system }}
strategy:
matrix:
operating-system: ["ubuntu-18.04", "ubuntu-20.04", "macos-10.15"]
swift-version: ["5.0.3", "5.1.5", "5.2.5", "5.3.3", "5.4.2"]
exclude:
- operating-system: "ubuntu-20.04"
operating-system: ["ubuntu-18.04", "ubuntu-20.04", "macos-10.15", "macos-11", "macos-12"]
swift-version: ["5.3.3", "5.4.3", "5.5.3", "5.6.1"]
include:
- operating-system: "ubuntu-18.04"
swift-version: "5.0.3"
- operating-system: "ubuntu-18.04"
swift-version: "5.1.5"
- operating-system: "ubuntu-18.04"
swift-version: "5.2.5"
- operating-system: "ubuntu-20.04"
swift-version: "5.2.5"
- operating-system: "macos-10.15"
swift-version: "5.1.5"
- operating-system: "macos-10.15"
swift-version: "5.2.5"
steps:
- uses: actions/checkout@v2
- uses: ./
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/units.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@ on:
jobs:
# unit tests
units:
runs-on: ubuntu-latest
strategy:
matrix:
runs-on: ["ubuntu-latest", "macos-latest"]
runs-on: ${{ matrix.runs-on }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@master
- run: npm ci
- run: npm test
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ See [action.yml](action.yml)
Basic:
```yaml
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: sinoru/actions-setup-swift@v2
with:
swift-version: '5.4.2' # Exact version of a Swift version to use
- run: swift build -v
- run: swift test -v
swift-version: '5.6.1' # Exact version of a Swift version to use
- run: swift build
- run: swift test
```
# License
Expand Down
Loading

0 comments on commit 996c023

Please sign in to comment.