Browse Source

Merge branch 'main' into dp/jpeg-decoder-invalid-marker-fix

pull/2147/head
Brian Popow 4 years ago
committed by GitHub
parent
commit
e74641a69e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      .github/workflows/build-and-test.yml
  2. 10
      .github/workflows/code-coverage.yml

10
.github/workflows/build-and-test.yml

@ -68,7 +68,7 @@ jobs:
run: git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id run: git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id
- name: Git Setup LFS Cache - name: Git Setup LFS Cache
uses: actions/cache@v2 uses: actions/cache@v3
id: lfs-cache id: lfs-cache
with: with:
path: .git/lfs path: .git/lfs
@ -81,7 +81,7 @@ jobs:
uses: NuGet/setup-nuget@v1 uses: NuGet/setup-nuget@v1
- name: NuGet Setup Cache - name: NuGet Setup Cache
uses: actions/cache@v2 uses: actions/cache@v3
id: nuget-cache id: nuget-cache
with: with:
path: ~/.nuget path: ~/.nuget
@ -89,7 +89,7 @@ jobs:
restore-keys: ${{ runner.os }}-nuget- restore-keys: ${{ runner.os }}-nuget-
- name: DotNet Setup - name: DotNet Setup
uses: actions/setup-dotnet@v1 uses: actions/setup-dotnet@v2
with: with:
include-prerelease: true include-prerelease: true
dotnet-version: | dotnet-version: |
@ -127,7 +127,7 @@ jobs:
XUNIT_PATH: .\tests\ImageSharp.Tests # Required for xunit XUNIT_PATH: .\tests\ImageSharp.Tests # Required for xunit
- name: Export Failed Output - name: Export Failed Output
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
if: failure() if: failure()
with: with:
name: actual_output_${{ runner.os }}_${{ matrix.options.framework }}${{ matrix.options.runtime }}.zip name: actual_output_${{ runner.os }}_${{ matrix.options.framework }}${{ matrix.options.runtime }}.zip
@ -157,7 +157,7 @@ jobs:
uses: NuGet/setup-nuget@v1 uses: NuGet/setup-nuget@v1
- name: NuGet Setup Cache - name: NuGet Setup Cache
uses: actions/cache@v2 uses: actions/cache@v3
id: nuget-cache id: nuget-cache
with: with:
path: ~/.nuget path: ~/.nuget

10
.github/workflows/code-coverage.yml

@ -34,7 +34,7 @@ jobs:
run: git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id run: git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id
- name: Git Setup LFS Cache - name: Git Setup LFS Cache
uses: actions/cache@v2 uses: actions/cache@v3
id: lfs-cache id: lfs-cache
with: with:
path: .git/lfs path: .git/lfs
@ -47,7 +47,7 @@ jobs:
uses: NuGet/setup-nuget@v1 uses: NuGet/setup-nuget@v1
- name: NuGet Setup Cache - name: NuGet Setup Cache
uses: actions/cache@v2 uses: actions/cache@v3
id: nuget-cache id: nuget-cache
with: with:
path: ~/.nuget path: ~/.nuget
@ -55,7 +55,7 @@ jobs:
restore-keys: ${{ runner.os }}-nuget- restore-keys: ${{ runner.os }}-nuget-
- name: DotNet Setup - name: DotNet Setup
uses: actions/setup-dotnet@v1 uses: actions/setup-dotnet@v2
with: with:
dotnet-version: | dotnet-version: |
6.0.x 6.0.x
@ -74,14 +74,14 @@ jobs:
XUNIT_PATH: .\tests\ImageSharp.Tests # Required for xunit XUNIT_PATH: .\tests\ImageSharp.Tests # Required for xunit
- name: Export Failed Output - name: Export Failed Output
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
if: failure() if: failure()
with: with:
name: actual_output_${{ runner.os }}_${{ matrix.options.framework }}${{ matrix.options.runtime }}.zip name: actual_output_${{ runner.os }}_${{ matrix.options.framework }}${{ matrix.options.runtime }}.zip
path: tests/Images/ActualOutput/ path: tests/Images/ActualOutput/
- name: Codecov Update - name: Codecov Update
uses: codecov/codecov-action@v1 uses: codecov/codecov-action@v3
if: matrix.options.codecov == true && startsWith(github.repository, 'SixLabors') if: matrix.options.codecov == true && startsWith(github.repository, 'SixLabors')
with: with:
flags: unittests flags: unittests

Loading…
Cancel
Save