From 054db1cac2d9826a33b8d93004fa2f96b0eca666 Mon Sep 17 00:00:00 2001 From: Vladimir Safonkin Date: Thu, 4 Feb 2021 11:43:20 +0300 Subject: [PATCH] Debug --- .github/workflows/workflow.yml | 18 ++++++++++-------- __tests__/verify-dotnet.sh | 5 ----- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 09340a9..8aad83c 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -64,11 +64,12 @@ jobs: run: | if (-Not (Test-Path "../nuget.config")) { throw "nuget file not generated correctly" } - name: Verify dotnet - if: runner.os != 'windows' - run: __tests__/verify-dotnet.sh 3.1.201 2.2.402 - - name: Verify dotnet (Windows) - if: runner.os == 'windows' + # if: runner.os != 'windows' + shell: pwsh 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: runs-on: ${{ matrix.operating-system }} @@ -88,11 +89,12 @@ jobs: with: dotnet-version: '3.1' - name: Verify dotnet - if: runner.os != 'windows' - run: __tests__/verify-dotnet.sh 3.1 - - name: Verify dotnet (Windows) - if: runner.os == 'windows' + # if: runner.os != 'windows' + shell: pwsh 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: runs-on: ${{ matrix.operating-system }} diff --git a/__tests__/verify-dotnet.sh b/__tests__/verify-dotnet.sh index b8f9492..9807577 100755 --- a/__tests__/verify-dotnet.sh +++ b/__tests__/verify-dotnet.sh @@ -3,11 +3,6 @@ if [ -z "$1" ]; then exit 1 fi -# if [ ! -f "../nuget.config" ]; then -# echo "nuget file not generated correctly" -# exit 1 -# fi - dotnet_version="$(dotnet --version)" echo "Found dotnet version '$dotnet_version'" if [ -z "$(echo $dotnet_version | grep $1)" ]; then