-
Notifications
You must be signed in to change notification settings - Fork 976
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'icsharpcode:master' into master
- Loading branch information
Showing
8 changed files
with
150 additions
and
88 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,7 +22,9 @@ jobs: | |
LIB_PROJ: src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj | ||
steps: | ||
- uses: actions/checkout@v2 | ||
|
||
with: | ||
fetch-depth: 0 | ||
|
||
- name: Setup .NET Core | ||
uses: actions/setup-dotnet@v1 | ||
with: | ||
|
@@ -39,46 +41,76 @@ jobs: | |
strategy: | ||
fail-fast: false | ||
matrix: | ||
os: [ubuntu, windows, macos] | ||
# Windows testing is combined with code coverage | ||
os: [ubuntu, macos] | ||
target: [netcoreapp3.1] | ||
include: | ||
- os: windows | ||
target: net46 | ||
steps: | ||
- uses: actions/checkout@v2 | ||
|
||
with: | ||
fetch-depth: 0 | ||
|
||
- name: Setup .NET Core | ||
if: matrix.target == 'netcoreapp3.1' | ||
uses: actions/setup-dotnet@v1 | ||
with: | ||
dotnet-version: '3.1.x' | ||
|
||
# NOTE: This is the temporary fix for https://github.com/actions/virtual-environments/issues/1090 | ||
- name: Cleanup before restore | ||
if: ${{ matrix.os == 'windows' }} | ||
run: dotnet clean ICSharpCode.SharpZipLib.sln && dotnet nuget locals all --clear | ||
|
||
- name: Restore test dependencies | ||
run: dotnet restore | ||
|
||
- name: Run tests (Debug) | ||
run: dotnet test -c debug -f ${{ matrix.target }} --no-restore | ||
|
||
- name: Run tests (Release) | ||
# Only upload code coverage for windows in an attempt to fix the broken code coverage | ||
if: ${{ matrix.os == 'windows' }} | ||
run: dotnet test -c release -f ${{ matrix.target }} --no-restore --collect="XPlat Code Coverage" | ||
|
||
- name: Run tests with coverage (Release) | ||
# Only upload code coverage for windows in an attempt to fix the broken code coverage | ||
if: ${{ matrix.os != 'windows' }} | ||
run: dotnet test -c release -f ${{ matrix.target }} --no-restore | ||
|
||
|
||
CodeCov: | ||
name: Code Coverage | ||
runs-on: windows-latest | ||
env: | ||
DOTCOVER_VER: 2021.1.2 | ||
DOTCOVER_PKG: jetbrains.dotcover.commandlinetools | ||
COVER_SNAPSHOT: SharpZipLib.dcvr | ||
steps: | ||
- uses: actions/checkout@v2 | ||
with: | ||
fetch-depth: 0 | ||
|
||
- name: Setup .NET | ||
uses: actions/setup-dotnet@v1 | ||
with: | ||
dotnet-version: '3.1.x' | ||
|
||
# NOTE: This is the temporary fix for https://github.com/actions/virtual-environments/issues/1090 | ||
- name: Cleanup before restore | ||
run: dotnet clean ICSharpCode.SharpZipLib.sln && dotnet nuget locals all --clear | ||
|
||
- name: Install codecov | ||
run: nuget install -o tools -version ${{env.DOTCOVER_VER}} ${{env.DOTCOVER_PKG}} | ||
|
||
- name: Add dotcover to path | ||
run: echo "$(pwd)\tools\${{env.DOTCOVER_PKG}}.${{env.DOTCOVER_VER}}\tools" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append | ||
|
||
- name: Run tests with code coverage | ||
run: dotcover dotnet --output=${{env.COVER_SNAPSHOT}} --filters=-:ICSharpCode.SharpZipLib.Tests -- test -c release | ||
|
||
- name: Create code coverage report | ||
run: dotcover report --source=${{env.COVER_SNAPSHOT}} --reporttype=detailedxml --output=dotcover-report.xml | ||
|
||
- name: Upload coverage to Codecov | ||
uses: codecov/[email protected] | ||
with: | ||
files: dotcover-report.xml | ||
|
||
- name: Upload coverage snapshot artifact | ||
uses: actions/upload-artifact@v2 | ||
with: | ||
name: Code coverage snapshot | ||
path: ${{env.COVER_SNAPSHOT}} | ||
|
||
Pack: | ||
needs: [Build, Test] | ||
needs: [Build, Test, CodeCov] | ||
runs-on: windows-latest | ||
env: | ||
PKG_SUFFIX: '' | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters