diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2700cd9..568652d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,46 +53,17 @@ jobs: run: dotnet pack --no-build -m:1 - name: ๐Ÿ›  vs - run: dotnet tool install -g dotnet-vs - - - name: ๐Ÿงช unit tests - working-directory: src/Xunit.Vsix.Tests - run: | - msbuild -r -m:1 -p:PackOnBuild=false -p:PkgBin="$env:GITHUB_WORKSPACE\bin" -bl:.\..\..\out\test.binlog - dotnet test --no-build --filter "Vsix!=true" --blame-hang-timeout 3m - - - name: ๐Ÿ›  vs - run: | + run: | dotnet tool install -g dotnet-vs vs /NoSplash /ResetSettings General /Command "File.Exit" wait-process -name 'devenv' vs - - name: ๐Ÿงช integration tests - timeout-minutes: 15 - working-directory: src/Xunit.Vsix.Tests - run: | - while ($true) { - dotnet test --no-build --filter "Vsix=true" -t | tee -variable tests - $total = $tests | %{ $_.trim() } | where { $_.startswith('Xunit.Vsix.Tests.') } | measure | select -expandproperty Count - if ($total -ge 20) { - break - } - } - - write-warning "Ensuring all $total integration tests are run..." - - while ($true) { - dotnet test --no-build --filter "Vsix=true" --blame-hang-timeout 3m | tee -variable results - $run = [int][regex]::Match($results, 'Total:\s+(?\d+)').Groups['run'].Value - if ($run -ge $total) { - break - } - - write-warning "Expected total tests $total but was $run. Retrying..." - } + - name: ๐Ÿงช test + uses: ./.github/workflows/test - name: โŽ vs + if: always() run: vs kill all - name: ๐Ÿ“ฆ artifact @@ -104,7 +75,6 @@ jobs: ./out ./**/*.dmp - # Only push CI package to sleet feed if building on ubuntu (fastest) - name: ๐Ÿš€ sleet env: SLEET_CONNECTION: ${{ secrets.SLEET_CONNECTION }}