diff options
| author | Roman Grundkiewicz <rgrundkiewicz@gmail.com> | 2020-11-19 23:12:28 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-19 23:12:28 +0300 |
| commit | 3b468e462809fe42a01a717c8d9307c465e6c35e (patch) | |
| tree | 420ceff6a035b5e21541140bb74c96e16c411cff | |
| parent | 2637a454adc681440edd61d54880670479e9afcd (diff) | |
Remove ::set-env from GitHub checks for Windows (#766)
| -rw-r--r-- | .github/workflows/windows.yml | 20 | ||||
| -rw-r--r-- | scripts/ci/install_cuda_windows.ps1 | 2 |
2 files changed, 10 insertions, 12 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 8d5f4a87..648887ae 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -36,24 +36,22 @@ jobs: run: | # Wget retries downloading files and is faster than Invoke-WebRequest C:\msys64\usr\bin\wget.exe -nv ${{ env.MKL_URL }} -O mkl.zip - Expand-Archive -Force mkl.zip ${{ github.workspace }}/mkl - # Set the MKLROOT environment variable so that CMake can find MKL. - # GITHUB_WORKSPACE is an environment variable available on all - # GitHub-hosted runners - echo "::set-env name=MKLROOT::$env:GITHUB_WORKSPACE/mkl" + Expand-Archive -Force mkl.zip ${{ github.workspace }}\mkl + # Set MKLROOT environment variable so that CMake can find MKL + echo "MKLROOT=${{ github.workspace }}\mkl" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append shell: powershell - name: Install CUDA run: | .\scripts\ci\install_cuda_windows.ps1 "10.2" - # Set path to CUDA for subsequent steps so that CMake can find it - echo "::set-env name=CUDA_PATH::$env:CUDA_PATH" - echo "::add-path::$env:CUDA_PATH/bin" + # Set CUDA_PATH environment variable so that CMake can find CUDA + echo "CUDA_PATH=$env:CUDA_PATH" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + echo "$env:CUDA_PATH/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append shell: powershell if: matrix.gpu == true - name: Prepare vcpkg - uses: lukka/run-vcpkg@v2 + uses: lukka/run-vcpkg@v4 with: vcpkgArguments: protobuf vcpkgGitCommitId: 6185aa76504a5025f36754324abf307cc776f3da @@ -62,7 +60,7 @@ jobs: # Windows CUDA builds use USE_NCCL=off due to compilation errors. - name: Build Debug - uses: lukka/run-cmake@v2 + uses: lukka/run-cmake@v3 with: buildDirectory: ${{ github.workspace }}/build/Debug cmakeAppendedArgs: '-G Ninja @@ -91,7 +89,7 @@ jobs: # https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md#boost # (not used yet) - name: Build Release - uses: lukka/run-cmake@v2 + uses: lukka/run-cmake@v3 with: buildDirectory: ${{ github.workspace }}/build/ cmakeAppendedArgs: '-G Ninja diff --git a/scripts/ci/install_cuda_windows.ps1 b/scripts/ci/install_cuda_windows.ps1 index 34c365bb..a6d09ebc 100644 --- a/scripts/ci/install_cuda_windows.ps1 +++ b/scripts/ci/install_cuda_windows.ps1 @@ -118,4 +118,4 @@ if (!$?) { $CUDA_PATH = "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v$($CUDA_MAJOR).$($CUDA_MINOR)" # Set environmental variables in this session $env:CUDA_PATH = "$($CUDA_PATH)" -Write-Output "CUDA_PATH $($CUDA_PATH)" +Write-Output "CUDA_PATH= $($CUDA_PATH)" |