This commit is contained in:
Vladimir Safonkin 2021-02-03 15:40:37 +03:00
parent 71f0d4bd07
commit 10ad86dc12
1 changed files with 25 additions and 16 deletions

View File

@ -43,7 +43,7 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Clear toolcache - name: Clear installed dotnet versions
shell: pwsh shell: pwsh
run: __tests__/clear-installed-dotnet.ps1 ${{ runner.os }} run: __tests__/clear-installed-dotnet.ps1 ${{ runner.os }}
# - name: Clear tool cache (macOS) # - name: Clear tool cache (macOS)
@ -86,24 +86,33 @@ jobs:
run: __tests__/verify-dotnet.ps1 3.1.201 2.2.402 run: __tests__/verify-dotnet.ps1 3.1.201 2.2.402
# Set new cache before 2 digit install # Set new cache before 2 digit install
- name: Set new tool cache (macOS) # - name: Set new tool cache (macOS)
if: runner.os == 'macos' # if: runner.os == 'macos'
run: | # run: |
echo "DOTNET_INSTALL_DIR=/Users/runner/.dotnet2" >> $GITHUB_ENV # echo "DOTNET_INSTALL_DIR=/Users/runner/.dotnet2" >> $GITHUB_ENV
- name: Set new tool cache (Ubuntu) # - name: Set new tool cache (Ubuntu)
if: runner.os == 'linux' # if: runner.os == 'linux'
run: | # run: |
echo "DOTNET_INSTALL_DIR=/home/runner/.dotnet2" >> $GITHUB_ENV # echo "DOTNET_INSTALL_DIR=/home/runner/.dotnet2" >> $GITHUB_ENV
- name: Set new tool cache (Windows) # - name: Set new tool cache (Windows)
if: runner.os == 'windows' # if: runner.os == 'windows'
shell: bash # shell: bash
run: | # run: |
echo "DOTNET_INSTALL_DIR=$LocalAppData\Microsoft\dotnet2" >> $GITHUB_ENV # echo "DOTNET_INSTALL_DIR=$LocalAppData\Microsoft\dotnet2" >> $GITHUB_ENV
# 2.0, 3.0, 5.0 needs to be in single quotes to interpret as a string instead of as an integer # 2.0, 3.0, 5.0 needs to be in single quotes to interpret as a string instead of as an integer
- name: Setup dotnet '2.0' - name: Clear installed dotnet versions
shell: pwsh
run: __tests__/clear-installed-dotnet.ps1 ${{ runner.os }}
- name: Setup dotnet '3.1'
uses: ./ uses: ./
with: with:
dotnet-version: '2.0' 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'
run: __tests__/verify-dotnet.ps1 3.1
# Clear cache before .x version install # Clear cache before .x version install
- name: Set new tool cache (macOS) - name: Set new tool cache (macOS)