ci: merge cross tests into regular packaging tests

This commit is contained in:
Caelan Sayler
2024-07-27 22:33:52 +01:00
parent 59fa8da1e2
commit 130f8ebc8f

View File

@@ -225,30 +225,13 @@ jobs:
with:
name: coverage-dotnet-${{ matrix.os }}
path: ./test/*.xml
test-cross:
strategy:
matrix:
os: [windows-latest, ubuntu-latest]
needs: [test-dotnet]
runs-on: ${{ matrix.os }}
env:
NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
steps:
- uses: actions/checkout@v4
- uses: caesay/wait-artifact-action@494939e840383463b1686ce3624a8aab059c2c8b
if: ${{ matrix.os == 'ubuntu-latest' || 'windows-latest' }}
with:
fetch-depth: 0
- uses: actions/cache@v4
with:
path: ${{ github.workspace }}/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
restore-keys: |
${{ runner.os }}-nuget-
- name: Install FUSE
run: |
sudo add-apt-repository universe
sudo apt install libfuse2
if: ${{ matrix.os == 'ubuntu-latest' }}
token: ${{ secrets.GITHUB_TOKEN }}
max_wait_seconds: 900
artifacts: cross-macos-latest,cross-ubuntu-latest,cross-windows-latest
verbose: true
- name: Download Cross Artifacts
uses: actions/download-artifact@v4
with:
@@ -258,7 +241,7 @@ jobs:
- name: Test Cross-Compiled Apps
env:
VELOPACK_CROSS_ARTIFACTS: true
run: dotnet test -c Release test/Velopack.Packaging.Tests/Velopack.Packaging.Tests.csproj --filter "FullyQualifiedName~RunCrossApp" -l "console;verbosity=detailed;consoleLoggerParameters=ErrorsOnly" -l GithubActions -- RunConfiguration.CollectSourceInformation=true
run: dotnet test test/Velopack.Packaging.Tests/Velopack.Packaging.Tests.csproj --no-build -c Release --filter "FullyQualifiedName~RunCrossApp" -l "console;verbosity=detailed;consoleLoggerParameters=ErrorsOnly" -l GithubActions -- RunConfiguration.CollectSourceInformation=true
package:
runs-on: ubuntu-latest
@@ -295,7 +278,7 @@ jobs:
upload-coverage:
runs-on: ubuntu-latest
needs: [test-rust-bins, test-dotnet, package]
needs: [package, test-dotnet, test-rust-bins]
steps:
- name: Download Coverage Artifacts
uses: actions/download-artifact@v4
@@ -315,7 +298,7 @@ jobs:
release:
runs-on: ubuntu-latest
needs: [package, test-cross, test-dotnet, test-rust-bins]
needs: [package, test-dotnet, test-rust-bins]
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
steps:
- name: Invoke Release Workflow