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

Merge branch 'main' of https://github.com/actions/virtual-environments into v-malob/xcode

Browse Source
This commit is contained in:
Maxim Lobanov
2020-11-09 17:51:05 +03:00
parent c1a5ebfc6a 7c13be802f
commit 142bbb8e24
5 changed files with 36 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
images/linux/scripts/installers/post-deployment.sh
View File

@@ -17,13 +17,12 @@ rm -rf $HELPER_SCRIPT_FOLDER
rm -rf $INSTALLER_SCRIPT_FOLDER rm -rf $INSTALLER_SCRIPT_FOLDER
chmod 755 $IMAGE_FOLDER chmod 755 $IMAGE_FOLDER
# Check PATH # Remove quotes around PATH
if [[ $PATH == \"*\" ]] ENVPATH=$(grep 'PATH=' /etc/environment | head -n 1 | sed -z 's/^PATH=*//')
then ENVPATH=${ENVPATH#"\""}
echo "ERROR: PATH contains quotes" ENVPATH=${ENVPATH%"\""}
echo "PATH = $PATH" echo "PATH=$ENVPATH" | sudo tee -a /etc/environment
exit 1 echo "Updated /etc/environment: $(cat /etc/environment)"
fi
# Clean yarn and npm cache # Clean yarn and npm cache
yarn cache clean yarn cache clean

32
images/macos/macos-11.0-Readme.md
View File

@@ -2,14 +2,14 @@
|-| |-|
| [Default Node.JS will be switched to 14.x on all platforms ](https://github.com/actions/virtual-environments/issues/1953) | | [Default Node.JS will be switched to 14.x on all platforms ](https://github.com/actions/virtual-environments/issues/1953) |
| [[macOS] Default Python will be upgraded to 3.9](https://github.com/actions/virtual-environments/issues/1929) | | [[macOS] Default Python will be upgraded to 3.9](https://github.com/actions/virtual-environments/issues/1929) |
| [.NET 5.0 will become a default .NET version on November, 10](https://github.com/actions/virtual-environments/issues/1891) | | [.NET 5.0 will become a default .NET version the week of November 16, 2020](https://github.com/actions/virtual-environments/issues/1891) |
| [macOS 11.0 (Big Sur) is available as a preview 🚀](https://github.com/actions/virtual-environments/issues/1814) | | [macOS 11.0 (Big Sur) is available as a preview 🚀](https://github.com/actions/virtual-environments/issues/1814) |
| [Xcode 11.0, 11.1, 11.4.0 will be deprecated on November, 5](https://github.com/actions/virtual-environments/issues/1688) | | [Xcode 11.0, 11.1, 11.4.0 will be deprecated on November, 5](https://github.com/actions/virtual-environments/issues/1688) |
*** ***
# macOS 11.0 info # macOS 11.0 info
- System Version: macOS 11.0 (20A5395g) - System Version: macOS 11.0 (20A5395g)
- Kernel Version: Darwin 20.1.0 - Kernel Version: Darwin 20.1.0
- Image Version: 20201102.1 - Image Version: 20201107.1
## Installed Software ## Installed Software
### Language and Runtime ### Language and Runtime
@@ -18,8 +18,8 @@
- gcc-9 (Homebrew GCC 9.3.0) 9.3.0 - available by `gcc-9` alias - gcc-9 (Homebrew GCC 9.3.0) 9.3.0 - available by `gcc-9` alias
- GNU Fortran (Homebrew GCC 8.4.0_1) 8.4.0 - available by `gfortran-8` alias - GNU Fortran (Homebrew GCC 8.4.0_1) 8.4.0 - available by `gfortran-8` alias
- GNU Fortran (Homebrew GCC 9.3.0) 9.3.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 9.3.0) 9.3.0 - available by `gfortran-9` alias
- Node.js v12.19.0 - Node.js v14.15.0
- NVM 0.36.0 - NVM 0.37.0
- NVM - Cached node versions: v6.17.1 v8.17.0 v10.23.0 v12.19.0 v13.14.0 v14.15.0 - NVM - Cached node versions: v6.17.1 v8.17.0 v10.23.0 v12.19.0 v13.14.0 v14.15.0
- Python 2.7.17 - Python 2.7.17
- Python 3.8.6 - Python 3.8.6
@@ -42,7 +42,7 @@
- NuGet 5.6.0.6489 - NuGet 5.6.0.6489
- Miniconda 4.8.3 - Miniconda 4.8.3
- RubyGems 3.1.4 - RubyGems 3.1.4
- Composer 2.0.4 - Composer 2.0.6
### Project Management ### Project Management
- Apache Maven 3.6.3 - Apache Maven 3.6.3
@@ -52,7 +52,7 @@
### Utilities ### Utilities
- Curl 7.73.0 - Curl 7.73.0
- Git: 2.29.2 - Git: 2.29.2
- Git LFS: 2.12.0 - Git LFS: 2.12.1
- GitHub CLI: 1.2.0 - GitHub CLI: 1.2.0
- Hub CLI: 2.14.2 - Hub CLI: 2.14.2
- GNU Wget 1.20.3 - GNU Wget 1.20.3
@@ -64,7 +64,7 @@
- psql (PostgreSQL) 13.0 - psql (PostgreSQL) 13.0
- PostgreSQL 13.0 - PostgreSQL 13.0
- aria2 1.35.0 - aria2 1.35.0
- azcopy 10.6.1 - azcopy 10.7.0
- zstd 1.4.5 - zstd 1.4.5
- bazel 3.7.0 - bazel 3.7.0
- bazelisk 1.7.4 - bazelisk 1.7.4
@@ -75,12 +75,12 @@
- Newman 5.2.1 - Newman 5.2.1
### Tools ### Tools
- Fastlane 2.165.0 - Fastlane 2.166.0
- Cmake 3.18.4 - Cmake 3.18.4
- App Center CLI 2.7.3 - App Center CLI 2.7.3
- Azure CLI 2.14.0 - Azure CLI 2.14.1
- AWS CLI 2.0.61 - AWS CLI 2.0.62
- AWS SAM CLI 1.7.0 - AWS SAM CLI 1.8.0
- AWS Session Manager CLI 1.2.7.0 - AWS Session Manager CLI 1.2.7.0
- Aliyun CLI 3.0.60 - Aliyun CLI 3.0.60
- GHCup v0.1.11 - GHCup v0.1.11
@@ -97,8 +97,8 @@
- SafariDriver 14.0.1 (16610.2.8.1.1) - SafariDriver 14.0.1 (16610.2.8.1.1)
- Google Chrome 86.0.4240.183 - Google Chrome 86.0.4240.183
- ChromeDriver 86.0.4240.22 - ChromeDriver 86.0.4240.22
- Microsoft Edge 86.0.622.58 - Microsoft Edge 86.0.622.63
- MSEdgeDriver 86.0.622.58 - MSEdgeDriver 86.0.622.63
- Mozilla Firefox 82.0.2 - Mozilla Firefox 82.0.2
- geckodriver 0.27.0 - geckodriver 0.27.0
@@ -125,7 +125,7 @@
- 14.15.0 - 14.15.0
#### Go #### Go
- 1.15.3 - 1.15.4
### Rust Tools ### Rust Tools
- Rust 1.47.0 - Rust 1.47.0
@@ -171,7 +171,7 @@
### Xcode ### Xcode
| Version | Build | Path | | Version | Build | Path |
| -------------- | -------- | ---------------------------- | | -------------- | -------- | ---------------------------- |
| 12.2 (beta) | 12B5035g | /Applications/Xcode_12.2.app | | 12.2 (beta) | 12B5044c | /Applications/Xcode_12.2.app |
| 11.7 (default) | 11E801a | /Applications/Xcode_11.7.app | | 11.7 (default) | 11E801a | /Applications/Xcode_11.7.app |
#### Xcode Support Tools #### Xcode Support Tools
@@ -214,7 +214,7 @@
| Android SDK Tools | 26.1.1 | | Android SDK Tools | 26.1.1 |
| Android SDK Platforms | android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platforms | android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) |
| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 |
| Android SDK Platform-Tools | 30.0.4 | | Android SDK Platform-Tools | 30.0.5 |
| Android Support Repository | 47.0.0 | | Android Support Repository | 47.0.0 |
| Google Play services | 49 | | Google Play services | 49 |
| Google Repository | 58 | | Google Repository | 58 |

6
images/macos/software-report/SoftwareReport.Generator.ps1
View File

@@ -82,6 +82,7 @@ $homebrewVersion = Run-Command "brew --version" | Select-Object -First 1
$npmVersion = Run-Command "npm --version" $npmVersion = Run-Command "npm --version"
$yarnVersion = Run-Command "yarn --version" $yarnVersion = Run-Command "yarn --version"
$nugetVersion = Run-Command "nuget help" | Select-Object -First 1 | Take-Part -Part 2 $nugetVersion = Run-Command "nuget help" | Select-Object -First 1 | Take-Part -Part 2
$pipVersion = Get-PipVersion -Version 2
$pip3Version = Get-PipVersion -Version 3 $pip3Version = Get-PipVersion -Version 3
$pipxVersion = Get-PipxVersion $pipxVersion = Get-PipxVersion
$condaVersion = Invoke-Expression "conda --version" $condaVersion = Invoke-Expression "conda --version"
@@ -93,12 +94,9 @@ if ($os.IsHigherThanMojave) {
$vcpkgVersion = Get-VcpkgVersion $vcpkgVersion = Get-VcpkgVersion
$markdown += New-MDList -Lines $vcpkgVersion -Style Unordered -NoNewLine $markdown += New-MDList -Lines $vcpkgVersion -Style Unordered -NoNewLine
} }
if ($os.IsLessThanBigSur) {
$pipVersion = Get-PipVersion -Version 2
$markdown += New-MDList -Style Unordered -Lines @("Pip ${pipVersion}") -NoNewLine
}
$markdown += New-MDList -Style Unordered -Lines @( $markdown += New-MDList -Style Unordered -Lines @(
"Pip ${pipVersion}",
"Pip ${pip3Version}", "Pip ${pip3Version}",
$pipxVersion, $pipxVersion,
$bundlerVersion, $bundlerVersion,

21
images/macos/tests/Java.Tests.ps1
View File

@@ -1,8 +1,6 @@
Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1"
#Java tests are disabled because Java is not working properly on macOS 11.0 yet.
$os = Get-OSVersion
function Get-NativeVersionFormat { function Get-NativeVersionFormat {
param($Version) param($Version)
if ($Version -in "7", "8") { if ($Version -in "7", "8") {
@@ -11,7 +9,7 @@ function Get-NativeVersionFormat {
return $Version return $Version
} }
Describe "Java" -Skip:($os.IsBigSur) { Describe "Java" {
BeforeAll { BeforeAll {
function Validate-JavaVersion { function Validate-JavaVersion {
param($JavaCommand, $ExpectedVersion) param($JavaCommand, $ExpectedVersion)
@@ -37,18 +35,19 @@ Describe "Java" -Skip:($os.IsBigSur) {
"/usr/libexec/java_home -v${Version}" | Should -ReturnZeroExitCode "/usr/libexec/java_home -v${Version}" | Should -ReturnZeroExitCode
} }
It "Version is valid" -TestCases $_ { if ($_.Title -ne "Default") {
$javaRootPath = (Get-CommandResult "/usr/libexec/java_home -v${Version}").Output It "Version is valid" -TestCases $_ {
$javaBinPath = Join-Path $javaRootPath "/bin/java" $javaRootPath = "/Library/Java/JavaVirtualMachines/adoptopenjdk-${Title}.jdk/Contents/Home"
Validate-JavaVersion -JavaCommand "$javaBinPath -version" -ExpectedVersion $Version if ($Title -eq "7") { $javaRootPath = "/Library/Java/JavaVirtualMachines/zulu-7.jdk/Contents/Home" }
$javaBinPath = Join-Path $javaRootPath "/bin/java"
Validate-JavaVersion -JavaCommand "$javaBinPath -version" -ExpectedVersion $Version
}
} }
It "<EnvVariable>" -TestCases $_ { It "<EnvVariable>" -TestCases $_ {
$envVariablePath = Get-EnvironmentVariable $EnvVariable $envVariablePath = Get-EnvironmentVariable $EnvVariable
$commandResult = Get-CommandResult "/usr/libexec/java_home -v${Version}" $javaBinPath = Join-Path $envVariablePath "/bin/java"
$commandResult.ExitCode | Should -Be 0 Validate-JavaVersion -JavaCommand "$javaBinPath -version" -ExpectedVersion $Version
$commandResult.Output | Should -Not -BeNullOrEmpty
$commandResult.Output | Should -Be $envVariablePath
} }
if ($_.Title -eq "Default") { if ($_.Title -eq "Default") {

4
images/macos/tests/Python.Tests.ps1
View File

@@ -12,7 +12,7 @@ Describe "Python" {
(Get-CommandResult "python --version").Output | Should -BeLike "Python 2.*" (Get-CommandResult "python --version").Output | Should -BeLike "Python 2.*"
} }
It "Python 2 is installed under /usr/local/bin" -Skip:($os.IsBigSur) { It "Python 2 is installed under /usr/local/bin" {
Get-WhichTool "python" | Should -BeLike "/usr/local/bin*" Get-WhichTool "python" | Should -BeLike "/usr/local/bin*"
} }
@@ -24,7 +24,7 @@ Describe "Python" {
Get-WhichTool "python3" | Should -BeLike "/usr/local/bin*" Get-WhichTool "python3" | Should -BeLike "/usr/local/bin*"
} }
It "Pip 2 is available" -Skip:($os.IsBigSur) { It "Pip 2 is available" {
"pip --version" | Should -ReturnZeroExitCode "pip --version" | Should -ReturnZeroExitCode
} }