Skip to content

Commit

Permalink
Merge branch 'master' into python/mypy-array-type-narrowing
Browse files Browse the repository at this point in the history
  • Loading branch information
jameslamb authored Sep 20, 2023
2 parents 11dbcb5 + fe7f8fe commit 3f5d0b5
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions .ci/test_r_package_windows.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,19 @@ if ($env:COMPILER -ne "MSVC") {
}
}

# Checking that the correct R version was used
if ($env:TOOLCHAIN -ne "MSVC") {
$checks = Select-String -Path "${LOG_FILE_NAME}" -Pattern "using R version $env:R_WINDOWS_VERSION"
$checks_cnt = $checks.Matches.length
} else {
$checks = Select-String -Path "${INSTALL_LOG_FILE_NAME}" -Pattern "R version passed into FindLibR.* $env:R_WINDOWS_VERSION"
$checks_cnt = $checks.Matches.length
}
if ($checks_cnt -eq 0) {
Write-Output "Wrong R version was found (expected '$env:R_WINDOWS_VERSION'). Check the build logs."
Check-Output $False
}

# Checking that we actually got the expected compiler. The R package has some logic
# to fail back to MinGW if MSVC fails, but for CI builds we need to check that the correct
# compiler was used.
Expand Down

0 comments on commit 3f5d0b5

Please sign in to comment.