actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-14 22:05:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add R tools for windows (#1264)

Browse Source 
* add R for windows

* fix tests

* fix for tests

* remove unused file

* fix doc version for R

Co-authored-by: Dmitry Shibanov <v-dmshib@microsoft.com>
This commit is contained in:
Dmitry Shibanov
2020-07-27 11:41:47 +03:00
committed by GitHub
parent 21165eb578
commit 0e0e62dceb
6 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
images/win/Windows2016-Azure.json
View File

@@ -477,6 +477,12 @@
"{{ template_dir }}/scripts/Installers/Install-Cmake.ps1" "{{ template_dir }}/scripts/Installers/Install-Cmake.ps1"
] ]
}, },
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Install-R.ps1"
]
},
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts":[

6
images/win/Windows2019-Azure.json
View File

@@ -452,6 +452,12 @@
"{{ template_dir }}/scripts/Installers/Install-Cmake.ps1" "{{ template_dir }}/scripts/Installers/Install-Cmake.ps1"
] ]
}, },
{
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Install-R.ps1"
]
},
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts":[

11
images/win/scripts/Installers/Install-R.ps1 Normal file
View File

@@ -0,0 +1,11 @@
################################################################################
## File: Install-R.ps1
## Desc: Install R for Windows
################################################################################
Choco-Install R.Project
Choco-Install rtools
$rscriptPath = Resolve-Path "C:\Program Files\R\*\bin\x64"
Add-MachinePathItem $rscriptPath
Invoke-PesterTests -TestFile "Tools" -TestName "R"

1
images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
View File

@@ -69,6 +69,7 @@ $markdown += New-MDList -Style Unordered -Lines @(
(Get-BazelVersion), (Get-BazelVersion),
(Get-BazeliskVersion), (Get-BazeliskVersion),
(Get-CMakeVersion), (Get-CMakeVersion),
(Get-RVersion),
(Get-DockerVersion), (Get-DockerVersion),
(Get-DockerComposeVersion), (Get-DockerComposeVersion),
(Get-GitVersion), (Get-GitVersion),

6
images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
View File

@@ -18,6 +18,12 @@ function Get-BazeliskVersion {
return "Bazelisk $bazeliskVersion" return "Bazelisk $bazeliskVersion"
} }
function Get-RVersion {
($(cmd /c "Rscript --version 2>&1") | Out-String) -match "R scripting front-end version (?<version>\d+\.\d+\.\d+)" | Out-Null
$rVersion = $Matches.Version
return "R $rVersion"
}
function Get-CMakeVersion { function Get-CMakeVersion {
($(cmake -version) | Out-String) -match "cmake version (?<version>\d+\.\d+\.\d+)" | Out-Null ($(cmake -version) | Out-String) -match "cmake version (?<version>\d+\.\d+\.\d+)" | Out-Null
$cmakeVersion = $Matches.Version $cmakeVersion = $Matches.Version

6
images/win/scripts/Tests/Tools.Tests.ps1
View File

@@ -73,6 +73,12 @@ Describe "CMake" {
} }
} }
Describe "R" {
It "Rscript" {
"Rscript --version" | Should -ReturnZeroExitCode
}
}
Describe "DACFx" { Describe "DACFx" {
It "DACFx" { It "DACFx" {
(Get-ItemProperty HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\*).DisplayName -Contains "Microsoft SQL Server Data-Tier Application Framework (x64)" | Should -BeTrue (Get-ItemProperty HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\*).DisplayName -Contains "Microsoft SQL Server Data-Tier Application Framework (x64)" | Should -BeTrue