This commit is contained in:
Vladimir Safonkin 2021-02-04 11:43:20 +03:00
parent 1317beb53a
commit 054db1cac2
2 changed files with 10 additions and 13 deletions

View File

@ -64,11 +64,12 @@ jobs:
run: | run: |
if (-Not (Test-Path "../nuget.config")) { throw "nuget file not generated correctly" } if (-Not (Test-Path "../nuget.config")) { throw "nuget file not generated correctly" }
- name: Verify dotnet - name: Verify dotnet
if: runner.os != 'windows' # if: runner.os != 'windows'
run: __tests__/verify-dotnet.sh 3.1.201 2.2.402 shell: pwsh
- name: Verify dotnet (Windows)
if: runner.os == 'windows'
run: __tests__/verify-dotnet.ps1 3.1.201 2.2.402 run: __tests__/verify-dotnet.ps1 3.1.201 2.2.402
# - name: Verify dotnet (Windows)
# if: runner.os == 'windows'
# run: __tests__/verify-dotnet.ps1 3.1.201 2.2.402
test-setup-without-patch-version: test-setup-without-patch-version:
runs-on: ${{ matrix.operating-system }} runs-on: ${{ matrix.operating-system }}
@ -88,11 +89,12 @@ jobs:
with: with:
dotnet-version: '3.1' dotnet-version: '3.1'
- name: Verify dotnet - name: Verify dotnet
if: runner.os != 'windows' # if: runner.os != 'windows'
run: __tests__/verify-dotnet.sh 3.1 shell: pwsh
- name: Verify dotnet (Windows)
if: runner.os == 'windows'
run: __tests__/verify-dotnet.ps1 3.1 run: __tests__/verify-dotnet.ps1 3.1
# - name: Verify dotnet (Windows)
# if: runner.os == 'windows'
# run: __tests__/verify-dotnet.ps1 3.1
test-setup-x-patch-version: test-setup-x-patch-version:
runs-on: ${{ matrix.operating-system }} runs-on: ${{ matrix.operating-system }}

View File

@ -3,11 +3,6 @@ if [ -z "$1" ]; then
exit 1 exit 1
fi fi
# if [ ! -f "../nuget.config" ]; then
# echo "nuget file not generated correctly"
# exit 1
# fi
dotnet_version="$(dotnet --version)" dotnet_version="$(dotnet --version)"
echo "Found dotnet version '$dotnet_version'" echo "Found dotnet version '$dotnet_version'"
if [ -z "$(echo $dotnet_version | grep $1)" ]; then if [ -z "$(echo $dotnet_version | grep $1)" ]; then