actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2026-01-08 11:30:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into v-dmshib/add-python3.9-win

Browse Source
This commit is contained in:
Dmitry Shibanov
2020-10-12 10:44:07 +03:00
parent cc2314394b 8a499f85a2
commit df05c38ba8
6 changed files with 1090 additions and 1088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitattributes vendored
View File

@@ -1,2 +1 @@
# Do not normalize line endings * text=auto eol=lf
* -text

3
images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1
View File

@@ -248,5 +248,6 @@ function Get-AptPackages {
} }
function Get-PipxVersion { function Get-PipxVersion {
return "Pipx $(pipx --version 2> $null)" $result = (Get-CommandResult "pipx --version").Output
return "Pipx $result"
} }

6
images/macos/provision/core/edge.sh
View File

@@ -1,7 +1,11 @@
source ~/utils/utils.sh source ~/utils/utils.sh
echo "Installing Microsoft Edge..." echo "Installing Microsoft Edge..."
# Workaround to install version 85 since webdriver is broken for 86
cd "$(brew --repo homebrew/homebrew-cask)"
git checkout 81f9d08d2b9b7557c0178621078cf59d2c5db2bc
brew cask install microsoft-edge brew cask install microsoft-edge
git checkout master
EDGE_INSTALLATION_PATH="/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge" EDGE_INSTALLATION_PATH="/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge"
EDGE_VERSION=$("$EDGE_INSTALLATION_PATH" --version | cut -d' ' -f 3) EDGE_VERSION=$("$EDGE_INSTALLATION_PATH" --version | cut -d' ' -f 3)
@@ -39,7 +43,7 @@ AUTOUPDATE_START="$HOME/Library/Preferences/com.microsoft.autoupdate2.plist"
while [ ! -f "$AUTOUPDATE_START" ] while [ ! -f "$AUTOUPDATE_START" ]
do do
echo "Wait for MS update automatic installation" echo "Wait for MS update automatic installation"
sleep 30 sleep 30
done done
echo "kill autoupdate process" echo "kill autoupdate process"

1152
images/win/Windows2016-Readme.md
View File

File diff suppressed because it is too large Load Diff

1012
images/win/Windows2019-Readme.md
View File

File diff suppressed because it is too large Load Diff

2
images/win/scripts/Installers/Install-Haskell.ps1
View File

@@ -4,7 +4,7 @@
################################################################################ ################################################################################
# Get 3 latest versions of GHC # Get 3 latest versions of GHC
[Version[]] $ChocoVersionsOutput = & choco search ghc --allversions --limit-output | Where-Object { $_.StartsWith("ghc|") } | ForEach-Object { $_.TrimStart("ghc|") } [Version[]] $ChocoVersionsOutput = & choco search ghc --allversions | Where-Object { $_.StartsWith("ghc ") -and $_ -match "Approved"} | ForEach-Object { [regex]::matches($_, "\d+(\.\d+){2,}").value }
$MajorMinorGroups = $ChocoVersionsOutput | Sort-Object -Descending | Group-Object { $_.ToString(2) } | Select-Object -First 3 $MajorMinorGroups = $ChocoVersionsOutput | Sort-Object -Descending | Group-Object { $_.ToString(2) } | Select-Object -First 3
$VersionsList = $MajorMinorGroups | ForEach-Object { $_.Group | Select-Object -First 1 } | Sort-Object $VersionsList = $MajorMinorGroups | ForEach-Object { $_.Group | Select-Object -First 1 } | Sort-Object