astzweig/swiftpm-mustache
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates from Package update

Browse Source
This commit is contained in:
Adam Fowler
2021-09-21 10:49:25 +01:00
parent dffe63d330
commit e544cd568e
6 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/ci.yml vendored
View File

@@ -35,7 +35,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
image: ['swift:5.3-bionic', 'swift:5.3-focal', 'swift:5.3-amazonlinux2', 'swift:5.3-centos8']
image:
- 'swift:5.4-bionic'
- 'swift:5.4-focal'
- 'swift:5.4-amazonlinux2'
- 'swift:5.4-centos8'
- 'swiftlang/swift:nightly-5.5-focal'
container:
image: ${{ matrix.image }}
@@ -44,7 +49,7 @@ jobs:
uses: actions/checkout@v2
- name: Test
run: |
swift test --enable-test-discovery --enable-code-coverage --sanitize=thread
swift test --enable-test-discovery --enable-code-coverage
- name: Convert coverage files
run: |
llvm-cov export -format="lcov" \

4
.github/workflows/nightly.yml vendored
View File

@@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
image: ['nightly-5.4-bionic', 'nightly-5.4-focal', 'nightly-5.4-centos8', 'nightly-5.4-amazonlinux2']
image: ['nightly-bionic', 'nightly-focal', 'nightly-centos8', 'nightly-amazonlinux2']
container:
image: swiftlang/swift:${{ matrix.image }}
@@ -26,4 +26,4 @@ jobs:
uses: actions/checkout@v2
- name: Test
run: |
swift test --enable-test-discovery --sanitize=thread
swift test --enable-test-discovery

2
.github/workflows/sanity.yml vendored
View File

@@ -16,6 +16,6 @@ jobs:
- name: Install Dependencies
run: |
brew install mint
mint install NickLockwood/SwiftFormat@0.47.4 --no-link
mint install NickLockwood/SwiftFormat@0.47.13 --no-link
- name: run script
run: ./scripts/sanity.sh

2
CONTRIBUTING.md
View File

@@ -30,4 +30,4 @@ The main development branch of the repository is `main`.
### Formatting
We use Nick Lockwood's SwiftFormat for formatting code. PRs will not be accepted if they haven't be formatted. The current version of SwiftFormat we are using is v0.47.4.
We use Nick Lockwood's SwiftFormat for formatting code. PRs will not be accepted if they haven't be formatted. The current version of SwiftFormat we are using is v0.47.13.

7
Dockerfile
View File

@@ -1,4 +1,7 @@
FROM swift:5.3-focal
# ================================
# Build image
# ================================
FROM swift:5.4 as build
WORKDIR /build
@@ -12,4 +15,4 @@ RUN swift package resolve
# Copy entire repo into container
COPY . .
RUN swift test --sanitize=thread --enable-test-discovery
RUN swift test --enable-test-discovery --sanitize=thread

6
scripts/sanity.sh
View File

@@ -13,7 +13,7 @@
##
##===----------------------------------------------------------------------===##
SWIFT_VERSION=5.1
SWIFT_FORMAT_VERSION=0.47.13
set -eu
here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -28,8 +28,8 @@ function replace_acceptable_years() {
printf "=> Checking format... "
FIRST_OUT="$(git status --porcelain)"
if [[ -n "${CI-""}" ]]; then
printf "(using v$(mint run NickLockwood/SwiftFormat@0.47.4 --version)) "
mint run NickLockwood/SwiftFormat@0.47.4 . > /dev/null 2>&1
printf "(using v$(mint run NickLockwood/SwiftFormat@"$SWIFT_FORMAT_VERSION" --version)) "
mint run NickLockwood/SwiftFormat@"$SWIFT_FORMAT_VERSION" . > /dev/null 2>&1
else
printf "(using v$(swiftformat --version)) "
swiftformat . > /dev/null 2>&1