diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0a19595..2d2241b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,7 +54,7 @@ jobs: - uses: actions/checkout@v2 - run: | swift --version - make swift-test + swift test --enable-test-discovery swift-test-linux: name: swift-test-linux - Swift ${{ matrix.swift-version }} @@ -65,7 +65,9 @@ jobs: fail-fast: false steps: - uses: actions/checkout@v2 - - run: make swift-test-linux SWIFT_VERSION=${{ matrix.swift-version }} + - run: | + swift --version + docker run --rm --volume "${PWD}:/src" --workdir "/src" swift:${{ matrix.swift-version }} swift test --enable-test-discovery codecov: name: codecov - Xcode ${{ matrix.xcode }} @@ -83,8 +85,7 @@ jobs: swift --version make export-codecov - name: codecov - if: success() uses: codecov/codecov-action@v1 with: - file: info.lcov + file: coverage.lcov token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.gitignore b/.gitignore index aa7f46a..ca56028 100644 --- a/.gitignore +++ b/.gitignore @@ -122,7 +122,7 @@ DerivedData/ /*.gcno # Codecov -info.lcov +coverage.lcov # Bundler /.bundle diff --git a/README.md b/README.md index 4a541c2..b0b6c96 100644 --- a/README.md +++ b/README.md @@ -18,13 +18,13 @@ - Written in Swift. - Supports console, file, syslog, and oslog as loggers. -- Support automatic log roration about file logger. +- Supports automatic log roration about file logger. - Supports both Darwin and Linux. - Supports apple/swift-log. ## Examples -**Logging to console and file and use file log rotation feature.** +**Logging to console and file using file log rotation feature.** You can basically use CocoaPods, Carthage, and Swift Package Manager for integration. diff --git a/scripts/llvm-cov-export.sh b/scripts/llvm-cov-export.sh index e14cece..0db3ed6 100755 --- a/scripts/llvm-cov-export.sh +++ b/scripts/llvm-cov-export.sh @@ -1,7 +1,7 @@ #!/bin/sh -echo "Deleting info.lcov..." -rm -f info.lcov +echo "Deleting coverage.lcov..." +rm -f coverage.lcov swift test --enable-test-discovery --enable-code-coverage @@ -24,4 +24,4 @@ esac $LLVM_COV export -format="lcov" "${COV_BIN}" \ -instr-profile=.build/debug/codecov/default.profdata \ -ignore-filename-regex=".build|Tests" \ - > info.lcov + > coverage.lcov