From 09dcae0f24d4b0ea85b4c9ae637d0f4aa065215f Mon Sep 17 00:00:00 2001 From: Chris Gavin Date: Tue, 8 Sep 2020 10:59:26 +0100 Subject: [PATCH 01/55] Install the CodeQL bundle in the toolcache. --- .../linux/scripts/installers/codeql-bundle.sh | 19 ++++++++++++++ .../Installers/Install-CodeQLBundle.ps1 | 26 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 images/linux/scripts/installers/codeql-bundle.sh create mode 100644 images/win/scripts/Installers/Install-CodeQLBundle.ps1 diff --git a/images/linux/scripts/installers/codeql-bundle.sh b/images/linux/scripts/installers/codeql-bundle.sh new file mode 100644 index 000000000..37e89abda --- /dev/null +++ b/images/linux/scripts/installers/codeql-bundle.sh @@ -0,0 +1,19 @@ +#!/bin/bash +################################################################################ +## File: codeql-bundle.sh +## Desc: Install the CodeQL CLI Bundle to the toolcache. +################################################################################ + +# Retrieve the name of the CodeQL bundle preferred by the Action (in the format codeql-bundle-YYYYMMDD). +codeql_bundle_name="$(curl -sSL https://raw.githubusercontent.com/github/codeql-action/main/src/defaults.json | jq -r .bundleVersion)" +# Convert the bundle name to a version number (0.0.0-YYYYMMDD). +codeql_bundle_version="0.0.0-${codeql_bundle_name##*-}" + +extraction_directory="$AGENT_TOOLSDIRECTORY/CodeQL/$codeql_bundle_version/x64" +mkdir -p "$extraction_directory" + +>&2 echo "Downloading CodeQL bundle $codeql_bundle_version..." +curl -sSL "https://github.com/github/codeql-action/releases/download/$codeql_bundle_name/codeql-bundle.tar.gz" | tar -xzC "$extraction_directory" + +# Test that the tool has been extracted successfully. +"$AGENT_TOOLSDIRECTORY/CodeQL/$codeql_bundle_version/x64/codeql/codeql" version diff --git a/images/win/scripts/Installers/Install-CodeQLBundle.ps1 b/images/win/scripts/Installers/Install-CodeQLBundle.ps1 new file mode 100644 index 000000000..6f25fa468 --- /dev/null +++ b/images/win/scripts/Installers/Install-CodeQLBundle.ps1 @@ -0,0 +1,26 @@ +################################################################################ +## File: Install-CodeQLBundle.ps1 +## Desc: Install the CodeQL CLI Bundle to the toolcache. +################################################################################ + +Import-Module -Name ImageHelpers + +# Retrieve the name of the CodeQL bundle preferred by the Action (in the format codeql-bundle-YYYYMMDD). +$CodeQLBundleName = (Invoke-WebRequest "https://raw.githubusercontent.com/github/codeql-action/main/src/defaults.json" | ConvertFrom-Json).bundleVersion +# Convert the bundle name to a version number (0.0.0-YYYYMMDD). +$CodeQLBundleVersion = "0.0.0-" + $CodeQLBundleName.split("-")[-1] + +$ExtractionDirectory = "$Env:AGENT_TOOLSDIRECTORY/CodeQL/$CodeQLBundleVersion/x64" +New-Item -Path $ExtractionDirectory -ItemType Directory -Force | Out-Null + +Write-Host "Downloading CodeQL bundle $CodeQLBundleVersion..." +$CodeQLBundlePath = Start-DownloadWithRetry -Url "https://github.com/github/codeql-action/releases/download/$CodeQLBundleName/codeql-bundle.tar.gz" -Name "codeql-bundle.tar.gz" +$DownloadDirectoryPath = (Get-Item $CodeQLBundlePath).Directory.FullName +Extract-7Zip -Path $CodeQLBundlePath -DestinationPath $DownloadDirectoryPath +Remove-Item -Path $CodeQLBundlePath +$UnGzipedCodeQLBundlePath = (Join-Path $DownloadDirectoryPath "codeql-bundle.tar") +Extract-7Zip -Path $UnGzipedCodeQLBundlePath -DestinationPath $ExtractionDirectory +Remove-Item -Path $UnGzipedCodeQLBundlePath + +# Test that the tool has been extracted successfully. +& (Join-Path $ExtractionDirectory "codeql" "codeql.exe") version From 79c4eb4910982ee20c0ce46a4172cd36db91a406 Mon Sep 17 00:00:00 2001 From: Chris Gavin Date: Tue, 8 Sep 2020 15:16:23 +0100 Subject: [PATCH 02/55] Tidy up CodeQL bundle Windows installer script in response to review comments. --- images/win/scripts/Installers/Install-CodeQLBundle.ps1 | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/images/win/scripts/Installers/Install-CodeQLBundle.ps1 b/images/win/scripts/Installers/Install-CodeQLBundle.ps1 index 6f25fa468..7878d6c65 100644 --- a/images/win/scripts/Installers/Install-CodeQLBundle.ps1 +++ b/images/win/scripts/Installers/Install-CodeQLBundle.ps1 @@ -3,24 +3,20 @@ ## Desc: Install the CodeQL CLI Bundle to the toolcache. ################################################################################ -Import-Module -Name ImageHelpers - # Retrieve the name of the CodeQL bundle preferred by the Action (in the format codeql-bundle-YYYYMMDD). -$CodeQLBundleName = (Invoke-WebRequest "https://raw.githubusercontent.com/github/codeql-action/main/src/defaults.json" | ConvertFrom-Json).bundleVersion +$CodeQLBundleName = (Invoke-RestMethod "https://raw.githubusercontent.com/github/codeql-action/main/src/defaults.json").bundleVersion # Convert the bundle name to a version number (0.0.0-YYYYMMDD). $CodeQLBundleVersion = "0.0.0-" + $CodeQLBundleName.split("-")[-1] -$ExtractionDirectory = "$Env:AGENT_TOOLSDIRECTORY/CodeQL/$CodeQLBundleVersion/x64" +$ExtractionDirectory = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath $CodeQLBundleVersion | Join-Path -ChildPath "x64" New-Item -Path $ExtractionDirectory -ItemType Directory -Force | Out-Null Write-Host "Downloading CodeQL bundle $CodeQLBundleVersion..." $CodeQLBundlePath = Start-DownloadWithRetry -Url "https://github.com/github/codeql-action/releases/download/$CodeQLBundleName/codeql-bundle.tar.gz" -Name "codeql-bundle.tar.gz" $DownloadDirectoryPath = (Get-Item $CodeQLBundlePath).Directory.FullName Extract-7Zip -Path $CodeQLBundlePath -DestinationPath $DownloadDirectoryPath -Remove-Item -Path $CodeQLBundlePath -$UnGzipedCodeQLBundlePath = (Join-Path $DownloadDirectoryPath "codeql-bundle.tar") +$UnGzipedCodeQLBundlePath = Join-Path $DownloadDirectoryPath "codeql-bundle.tar" Extract-7Zip -Path $UnGzipedCodeQLBundlePath -DestinationPath $ExtractionDirectory -Remove-Item -Path $UnGzipedCodeQLBundlePath # Test that the tool has been extracted successfully. & (Join-Path $ExtractionDirectory "codeql" "codeql.exe") version From 096464f38eb8597540566cead683c8a72b65a8f6 Mon Sep 17 00:00:00 2001 From: Chris Gavin Date: Tue, 8 Sep 2020 15:23:49 +0100 Subject: [PATCH 03/55] Tidy up CodeQL bundle Linux installer script in response to review comments. --- images/linux/scripts/installers/codeql-bundle.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/codeql-bundle.sh b/images/linux/scripts/installers/codeql-bundle.sh index 37e89abda..600089630 100644 --- a/images/linux/scripts/installers/codeql-bundle.sh +++ b/images/linux/scripts/installers/codeql-bundle.sh @@ -4,6 +4,8 @@ ## Desc: Install the CodeQL CLI Bundle to the toolcache. ################################################################################ +source $HELPER_SCRIPTS/install.sh + # Retrieve the name of the CodeQL bundle preferred by the Action (in the format codeql-bundle-YYYYMMDD). codeql_bundle_name="$(curl -sSL https://raw.githubusercontent.com/github/codeql-action/main/src/defaults.json | jq -r .bundleVersion)" # Convert the bundle name to a version number (0.0.0-YYYYMMDD). @@ -12,8 +14,9 @@ codeql_bundle_version="0.0.0-${codeql_bundle_name##*-}" extraction_directory="$AGENT_TOOLSDIRECTORY/CodeQL/$codeql_bundle_version/x64" mkdir -p "$extraction_directory" ->&2 echo "Downloading CodeQL bundle $codeql_bundle_version..." -curl -sSL "https://github.com/github/codeql-action/releases/download/$codeql_bundle_name/codeql-bundle.tar.gz" | tar -xzC "$extraction_directory" +echo "Downloading CodeQL bundle $codeql_bundle_version..." +download_with_retries "https://github.com/github/codeql-action/releases/download/$codeql_bundle_name/codeql-bundle.tar.gz" "/tmp" "codeql-bundle.tar.gz" +tar -xzf "/tmp/codeql-bundle.tar.gz" -C "$extraction_directory" # Test that the tool has been extracted successfully. "$AGENT_TOOLSDIRECTORY/CodeQL/$codeql_bundle_version/x64/codeql/codeql" version From ff346a80bd28bc6eb71dcbc27c8fb97e05bbd523 Mon Sep 17 00:00:00 2001 From: Chris Gavin Date: Tue, 8 Sep 2020 15:27:27 +0100 Subject: [PATCH 04/55] Actually call CodeQL bundle install scripts in Packer. --- images/linux/ubuntu1604.json | 1 + images/linux/ubuntu1804.json | 1 + images/linux/ubuntu2004.json | 1 + images/win/Windows2016-Azure.json | 3 ++- images/win/Windows2019-Azure.json | 3 ++- 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index cf7aef1ab..93161553c 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -153,6 +153,7 @@ "{{template_dir}}/scripts/installers/clang.sh", "{{template_dir}}/scripts/installers/swift.sh", "{{template_dir}}/scripts/installers/cmake.sh", + "{{template_dir}}/scripts/installers/codeql-bundle.sh", "{{template_dir}}/scripts/installers/docker-compose.sh", "{{template_dir}}/scripts/installers/docker-moby.sh", "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh", diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 956e67739..c8e3da108 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -155,6 +155,7 @@ "{{template_dir}}/scripts/installers/clang.sh", "{{template_dir}}/scripts/installers/swift.sh", "{{template_dir}}/scripts/installers/cmake.sh", + "{{template_dir}}/scripts/installers/codeql-bundle.sh", "{{template_dir}}/scripts/installers/containers.sh", "{{template_dir}}/scripts/installers/docker-compose.sh", "{{template_dir}}/scripts/installers/docker-moby.sh", diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index 8a1d2d615..6f472c2d0 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -157,6 +157,7 @@ "{{template_dir}}/scripts/installers/clang.sh", "{{template_dir}}/scripts/installers/swift.sh", "{{template_dir}}/scripts/installers/cmake.sh", + "{{template_dir}}/scripts/installers/codeql-bundle.sh", "{{template_dir}}/scripts/installers/containers.sh", "{{template_dir}}/scripts/installers/docker-compose.sh", "{{template_dir}}/scripts/installers/docker-moby.sh", diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json index af87f5e87..39dcb254e 100644 --- a/images/win/Windows2016-Azure.json +++ b/images/win/Windows2016-Azure.json @@ -320,7 +320,8 @@ "{{ template_dir }}/scripts/Installers/Install-KubernetesCli.ps1", "{{ template_dir }}/scripts/Installers/Install-Kind.ps1", "{{ template_dir }}/scripts/Installers/Install-MongoDB.ps1", - "{{ template_dir }}/scripts/Installers/Install-GoogleCloudSDK.ps1" + "{{ template_dir }}/scripts/Installers/Install-GoogleCloudSDK.ps1", + "{{ template_dir }}/scripts/Installers/Install-CodeQLBundle.ps1" ] }, { diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json index 85c722061..a261ab177 100644 --- a/images/win/Windows2019-Azure.json +++ b/images/win/Windows2019-Azure.json @@ -319,7 +319,8 @@ "{{ template_dir }}/scripts/Installers/Install-AliyunCli.ps1", "{{ template_dir }}/scripts/Installers/Install-RootCA.ps1", "{{ template_dir }}/scripts/Installers/Install-MongoDB.ps1", - "{{ template_dir }}/scripts/Installers/Install-GoogleCloudSDK.ps1" + "{{ template_dir }}/scripts/Installers/Install-GoogleCloudSDK.ps1", + "{{ template_dir }}/scripts/Installers/Install-CodeQLBundle.ps1" ] }, { From 81942c8299ade2a7c017362711dbca501d217db1 Mon Sep 17 00:00:00 2001 From: Chris Gavin Date: Wed, 9 Sep 2020 15:50:49 +0100 Subject: [PATCH 05/55] Convert CodeQL Windows test to a Pester test. --- images/win/scripts/Installers/Install-CodeQLBundle.ps1 | 3 ++- images/win/scripts/Tests/Tools.Tests.ps1 | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-CodeQLBundle.ps1 b/images/win/scripts/Installers/Install-CodeQLBundle.ps1 index 7878d6c65..d5ecf1b5a 100644 --- a/images/win/scripts/Installers/Install-CodeQLBundle.ps1 +++ b/images/win/scripts/Installers/Install-CodeQLBundle.ps1 @@ -19,4 +19,5 @@ $UnGzipedCodeQLBundlePath = Join-Path $DownloadDirectoryPath "codeql-bundle.tar" Extract-7Zip -Path $UnGzipedCodeQLBundlePath -DestinationPath $ExtractionDirectory # Test that the tool has been extracted successfully. -& (Join-Path $ExtractionDirectory "codeql" "codeql.exe") version +$Env:CODEQL_EXTRACTION_DIRECTORY = $ExtractionDirectory +Invoke-PesterTests -TestFile "Tools" -TestName "CodeQLBundle" diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 88f2ca88f..c2b52baf9 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -41,6 +41,13 @@ Describe "CMake" { } } +Describe "CodeQLBundle" { + It "CodeQLBundle" { + $CodeQLPath = Join-Path $Env:CODEQL_EXTRACTION_DIRECTORY -ChildPath "codeql" | Join-Path -ChildPath "codeql.exe" + "$CodeQLPath version" | Should -ReturnZeroExitCode + } +} + Describe "R" { It "Rscript" { "Rscript --version" | Should -ReturnZeroExitCode From 9337c6edb44c72f0fc1874ea834025b0c6f5be09 Mon Sep 17 00:00:00 2001 From: Chris Gavin Date: Tue, 15 Sep 2020 13:54:28 +0100 Subject: [PATCH 06/55] Fix not being able to find CodeQL. --- images/win/scripts/Installers/Install-CodeQLBundle.ps1 | 1 - images/win/scripts/Tests/Tools.Tests.ps1 | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-CodeQLBundle.ps1 b/images/win/scripts/Installers/Install-CodeQLBundle.ps1 index d5ecf1b5a..46a597592 100644 --- a/images/win/scripts/Installers/Install-CodeQLBundle.ps1 +++ b/images/win/scripts/Installers/Install-CodeQLBundle.ps1 @@ -19,5 +19,4 @@ $UnGzipedCodeQLBundlePath = Join-Path $DownloadDirectoryPath "codeql-bundle.tar" Extract-7Zip -Path $UnGzipedCodeQLBundlePath -DestinationPath $ExtractionDirectory # Test that the tool has been extracted successfully. -$Env:CODEQL_EXTRACTION_DIRECTORY = $ExtractionDirectory Invoke-PesterTests -TestFile "Tools" -TestName "CodeQLBundle" diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index c2b52baf9..4470dda01 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -43,7 +43,9 @@ Describe "CMake" { Describe "CodeQLBundle" { It "CodeQLBundle" { - $CodeQLPath = Join-Path $Env:CODEQL_EXTRACTION_DIRECTORY -ChildPath "codeql" | Join-Path -ChildPath "codeql.exe" + $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "codeql" | Join-Path -ChildPath "*" + $CodeQLVersionPath = (Get-Item $CodeQLVersionsWildcard).FullPath + $CodeQLPath = Join-Path CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql.exe" "$CodeQLPath version" | Should -ReturnZeroExitCode } } From 53db4e15c431c12e04d168be293da25e6cbc808a Mon Sep 17 00:00:00 2001 From: Chris Gavin Date: Wed, 16 Sep 2020 14:11:22 +0100 Subject: [PATCH 07/55] Fix a typo. --- images/win/scripts/Tests/Tools.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 242ae296b..027cc9424 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -45,7 +45,7 @@ Describe "CodeQLBundle" { It "CodeQLBundle" { $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "codeql" | Join-Path -ChildPath "*" $CodeQLVersionPath = (Get-Item $CodeQLVersionsWildcard).FullPath - $CodeQLPath = Join-Path CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql.exe" + $CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql.exe" "$CodeQLPath version" | Should -ReturnZeroExitCode } } From 6877c76a4e6aa1eab8b4583e346ab05fdc69e428 Mon Sep 17 00:00:00 2001 From: Chris Gavin Date: Thu, 17 Sep 2020 09:57:18 +0100 Subject: [PATCH 08/55] Fix another PowerShell issue. --- images/win/scripts/Tests/Tools.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 027cc9424..cbb0609a5 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -44,7 +44,7 @@ Describe "CMake" { Describe "CodeQLBundle" { It "CodeQLBundle" { $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "codeql" | Join-Path -ChildPath "*" - $CodeQLVersionPath = (Get-Item $CodeQLVersionsWildcard).FullPath + $CodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Select-Object -First 1 -Expand FullName $CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql.exe" "$CodeQLPath version" | Should -ReturnZeroExitCode } From c72e08b8b6d226ae58eba7170344b3d81278d26d Mon Sep 17 00:00:00 2001 From: Chris Gavin Date: Thu, 17 Sep 2020 12:02:44 +0100 Subject: [PATCH 09/55] Touch a file to indicate the source of pre-downloaded CodeQL bundles. --- images/linux/scripts/installers/codeql-bundle.sh | 3 +++ images/win/scripts/Installers/Install-CodeQLBundle.ps1 | 3 +++ 2 files changed, 6 insertions(+) diff --git a/images/linux/scripts/installers/codeql-bundle.sh b/images/linux/scripts/installers/codeql-bundle.sh index 600089630..825ce0708 100644 --- a/images/linux/scripts/installers/codeql-bundle.sh +++ b/images/linux/scripts/installers/codeql-bundle.sh @@ -18,5 +18,8 @@ echo "Downloading CodeQL bundle $codeql_bundle_version..." download_with_retries "https://github.com/github/codeql-action/releases/download/$codeql_bundle_name/codeql-bundle.tar.gz" "/tmp" "codeql-bundle.tar.gz" tar -xzf "/tmp/codeql-bundle.tar.gz" -C "$extraction_directory" +# Touch a special file that indicates to the CodeQL Action that this bundle was baked-in to the hosted runner images. +touch "$extraction_directory/pinned-version" + # Test that the tool has been extracted successfully. "$AGENT_TOOLSDIRECTORY/CodeQL/$codeql_bundle_version/x64/codeql/codeql" version diff --git a/images/win/scripts/Installers/Install-CodeQLBundle.ps1 b/images/win/scripts/Installers/Install-CodeQLBundle.ps1 index 46a597592..d8f21f0df 100644 --- a/images/win/scripts/Installers/Install-CodeQLBundle.ps1 +++ b/images/win/scripts/Installers/Install-CodeQLBundle.ps1 @@ -18,5 +18,8 @@ Extract-7Zip -Path $CodeQLBundlePath -DestinationPath $DownloadDirectoryPath $UnGzipedCodeQLBundlePath = Join-Path $DownloadDirectoryPath "codeql-bundle.tar" Extract-7Zip -Path $UnGzipedCodeQLBundlePath -DestinationPath $ExtractionDirectory +# Touch a special file that indicates to the CodeQL Action that this bundle was baked-in to the hosted runner images. +New-Item -ItemType file (Join-Path $ExtractionDirectory -ChildPath "pinned-version") + # Test that the tool has been extracted successfully. Invoke-PesterTests -TestFile "Tools" -TestName "CodeQLBundle" From 60d40e5dd5ab9498790068244fbe52fe91c072be Mon Sep 17 00:00:00 2001 From: Chris Gavin Date: Thu, 17 Sep 2020 18:41:07 +0100 Subject: [PATCH 10/55] Document the CodeQL version that is installed. --- images/linux/scripts/installers/codeql-bundle.sh | 5 +++++ .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 1 + .../win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 8 ++++++++ 3 files changed, 14 insertions(+) diff --git a/images/linux/scripts/installers/codeql-bundle.sh b/images/linux/scripts/installers/codeql-bundle.sh index 825ce0708..e07f2a082 100644 --- a/images/linux/scripts/installers/codeql-bundle.sh +++ b/images/linux/scripts/installers/codeql-bundle.sh @@ -5,6 +5,7 @@ ################################################################################ source $HELPER_SCRIPTS/install.sh +source $HELPER_SCRIPTS/document.sh # Retrieve the name of the CodeQL bundle preferred by the Action (in the format codeql-bundle-YYYYMMDD). codeql_bundle_name="$(curl -sSL https://raw.githubusercontent.com/github/codeql-action/main/src/defaults.json | jq -r .bundleVersion)" @@ -23,3 +24,7 @@ touch "$extraction_directory/pinned-version" # Test that the tool has been extracted successfully. "$AGENT_TOOLSDIRECTORY/CodeQL/$codeql_bundle_version/x64/codeql/codeql" version + +# Document the version installed. +version="$("$AGENT_TOOLSDIRECTORY/CodeQL/$codeql_bundle_version/x64/codeql/codeql" version --quiet)" +DocumentInstalledItem "CodeQL Action Bundle ($version)" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index eb8b35f0d..905b9da96 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -77,6 +77,7 @@ $markdown += New-MDList -Style Unordered -Lines @( (Get-BazelVersion), (Get-BazeliskVersion), (Get-CMakeVersion), + (Get-CodeQLBundleVersion), (Get-RVersion), (Get-DockerVersion), (Get-DockerComposeVersion), diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index e7235408f..e6d70fecb 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -30,6 +30,14 @@ function Get-CMakeVersion { return "CMake $cmakeVersion" } +function Get-CodeQLBundleVersion { + $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "codeql" | Join-Path -ChildPath "*" + $CodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Select-Object -First 1 -Expand FullName + $CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql.exe" + $CodeQLVersion = $($CodeQLPath version --quiet) + return "CodeQL Action Bundle $CodeQLVersion" +} + function Get-DockerVersion { $dockerVersion = $(docker version --format "{{.Server.Version}}") return "Docker $dockerVersion" From 49dc2ce2fd3a5f616ce8f7f5412ed918d928be14 Mon Sep 17 00:00:00 2001 From: Chris Gavin Date: Sun, 20 Sep 2020 09:29:43 +0100 Subject: [PATCH 11/55] Use new approach for documenting CodeQL on Ubuntu. --- .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 1 + .../scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 8 ++++++++ images/linux/scripts/installers/codeql-bundle.sh | 5 ----- .../win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 73a8d63e7..7e6db3743 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -77,6 +77,7 @@ $toolsList = @( (Get-AzCopy10Version), (Get-BazelVersion), (Get-BazeliskVersion), + (Get-CodeQLBundleVersion), (Get-CMakeVersion), (Get-CurlVersion), (Get-DockerMobyVersion), diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index dcb121f61..4f7d64e36 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -28,6 +28,14 @@ function Get-BazeliskVersion { return "Bazelisk $bazeliskVersion" } +function Get-CodeQLBundleVersion { + $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "codeql" | Join-Path -ChildPath "*" + $CodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Select-Object -First 1 -Expand FullName + $CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" + $CodeQLVersion = $($CodeQLPath version --quiet) + return "CodeQL Action Bundle $CodeQLVersion" +} + function Get-PodManVersion { $podmanVersion = podman --version | Take-OutputPart -Part 2 return "Podman $podmanVersion" diff --git a/images/linux/scripts/installers/codeql-bundle.sh b/images/linux/scripts/installers/codeql-bundle.sh index e07f2a082..825ce0708 100644 --- a/images/linux/scripts/installers/codeql-bundle.sh +++ b/images/linux/scripts/installers/codeql-bundle.sh @@ -5,7 +5,6 @@ ################################################################################ source $HELPER_SCRIPTS/install.sh -source $HELPER_SCRIPTS/document.sh # Retrieve the name of the CodeQL bundle preferred by the Action (in the format codeql-bundle-YYYYMMDD). codeql_bundle_name="$(curl -sSL https://raw.githubusercontent.com/github/codeql-action/main/src/defaults.json | jq -r .bundleVersion)" @@ -24,7 +23,3 @@ touch "$extraction_directory/pinned-version" # Test that the tool has been extracted successfully. "$AGENT_TOOLSDIRECTORY/CodeQL/$codeql_bundle_version/x64/codeql/codeql" version - -# Document the version installed. -version="$("$AGENT_TOOLSDIRECTORY/CodeQL/$codeql_bundle_version/x64/codeql/codeql" version --quiet)" -DocumentInstalledItem "CodeQL Action Bundle ($version)" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index e6d70fecb..a90e13dd1 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -254,4 +254,4 @@ function Get-VisualCPPComponents { } } } -} \ No newline at end of file +} From a636448540ba83c39b0f0ddb4f180d47d1c27f7b Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Sun, 20 Sep 2020 19:53:35 +0300 Subject: [PATCH 12/55] hardcode edge --- images/win/scripts/Installers/Install-Edge.ps1 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/images/win/scripts/Installers/Install-Edge.ps1 b/images/win/scripts/Installers/Install-Edge.ps1 index ebb7871b7..ada5eaacb 100644 --- a/images/win/scripts/Installers/Install-Edge.ps1 +++ b/images/win/scripts/Installers/Install-Edge.ps1 @@ -17,12 +17,13 @@ Write-Host "Get the Microsoft Edge WebDriver version..." $RegistryPath = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths" $EdgePath = (Get-ItemProperty "$RegistryPath\msedge.exe").'(default)' [version]$EdgeVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($EdgePath).ProductVersion -$EdgeDriverVersionUrl = "https://msedgedriver.azureedge.net/LATEST_RELEASE_$($EdgeVersion.Major)" +#$EdgeDriverVersionUrl = "https://msedgedriver.azureedge.net/LATEST_RELEASE_$($EdgeVersion.Major)" -$EdgeDriverVersionFile = Start-DownloadWithRetry -Url $EdgeDriverVersionUrl -Name "versioninfo.txt" -DownloadPath $EdgeDriverPath +#$EdgeDriverVersionFile = Start-DownloadWithRetry -Url $EdgeDriverVersionUrl -Name "versioninfo.txt" -DownloadPath $EdgeDriverPath +Add-Content -Path "${EdgeDriverPath}\versioninfo.txt" -Value "85.0.564.51" Write-Host "Download Microsoft Edge WebDriver..." -$EdgeDriverLatestVersion = Get-Content -Path $EdgeDriverVersionFile +$EdgeDriverLatestVersion = Get-Content -Path "${EdgeDriverPath}\versioninfo.txt" $EdgeDriverArchName = "edgedriver_win64.zip" $EdgeDriverDownloadUrl="https://msedgedriver.azureedge.net/${EdgeDriverLatestVersion}/${EdgeDriverArchName}" From 37668db1c4950a1e6c962ed6344db37bf405095f Mon Sep 17 00:00:00 2001 From: Chris Gavin Date: Mon, 21 Sep 2020 08:43:39 +0100 Subject: [PATCH 13/55] Fix CodeQL documentation function. --- images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 4f7d64e36..363b4adbf 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -32,7 +32,7 @@ function Get-CodeQLBundleVersion { $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "codeql" | Join-Path -ChildPath "*" $CodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Select-Object -First 1 -Expand FullName $CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" - $CodeQLVersion = $($CodeQLPath version --quiet) + $CodeQLVersion = & $CodeQLPath version --quiet return "CodeQL Action Bundle $CodeQLVersion" } From 8de9bcc26c144ed1f31e874de40e98c7007e424f Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Mon, 21 Sep 2020 10:53:56 +0300 Subject: [PATCH 14/55] add AppleWWDRCAG3.cer --- .../configuration/configure-machine.sh | 11 +++++++++- images/macos/tests/Common.Tests.ps1 | 22 +++++++++++++------ 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/images/macos/provision/configuration/configure-machine.sh b/images/macos/provision/configuration/configure-machine.sh index d34d7002a..dbfae6731 100644 --- a/images/macos/provision/configuration/configure-machine.sh +++ b/images/macos/provision/configuration/configure-machine.sh @@ -18,4 +18,13 @@ sudo pmset hibernatemode 0 sudo rm -f /var/vm/sleepimage # Change screen resolution to the maximum supported for 4Mb video memory -sudo "/Library/Application Support/VMware Tools/vmware-resolutionSet" 1176 885 \ No newline at end of file +sudo "/Library/Application Support/VMware Tools/vmware-resolutionSet" 1176 885 + +# https://developer.apple.com/support/expiration/ +# Enterprise iOS Distribution Certificates generated between February 7 and September 1st, 2020 will expire on February 7, 2023. +# Rotate the certificate before expiration to ensure your apps are installed and signed with an active certificate. +# Confirm that the correct intermediate certificate is installed by verifying the expiration date is set to 2030. +# sudo security delete-certificate -Z FF6797793A3CD798DC5B2ABEF56F73EDC9F83A64 /Library/Keychains/System.keychain +curl https://www.apple.com/certificateauthority/AppleWWDRCAG3.cer --output $HOME/AppleWWDRCAG3.cer --silent +sudo security add-trusted-cert -d -r unspecified -k /Library/Keychains/System.keychain $HOME/AppleWWDRCAG3.cer +rm $HOME/AppleWWDRCAG3.cer \ No newline at end of file diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index ed813f58c..df7d505e5 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -12,6 +12,14 @@ Describe "Disk free space" { } } +Describe "Certificate" { + It "Apple Worldwide Developer Relations Certification Authority[expired: 2030-02] is installed" { + $sha1Hash = "06EC06599F4ED0027CC58956B4D3AC1255114F35" + $certs = security find-certificate -a -c Worldwide -p -Z | Out-String + $certs | Should -Match $sha1Hash + } +} + Describe "Git" { It "git is installed" { "git --version" | Should -ReturnZeroExitCode @@ -161,7 +169,7 @@ Describe "Common utilities" { It "PostgreSQL-Client" { "psql --version" | Should -ReturnZeroExitCode } - + It "PostgreSQL-Server" { "pg_config --version" | Should -ReturnZeroExitCode } @@ -178,11 +186,11 @@ Describe "Common utilities" { Get-WhichTool "php" | Should -Not -BeLike "/usr/bin/php*" "php --version" | Should -ReturnZeroExitCode } - + It "Composer" { "composer --version" | Should -ReturnZeroExitCode } - + It "R" -Skip:($os.IsBigSur) { "R --version" | Should -ReturnZeroExitCode } @@ -198,7 +206,7 @@ Describe "Common utilities" { It "bazelisk" { "bazelisk version" | Should -ReturnZeroExitCode } - + It "Julia" { "julia --version" | Should -ReturnZeroExitCode } @@ -252,7 +260,7 @@ Describe "Browsers" { It "Microsoft Edge Driver" { "msedgedriver --version" | Should -ReturnZeroExitCode } - + It "Firefox" { $firefoxLocation = "/Applications/Firefox.app/Contents/MacOS/firefox" $firefoxLocation | Should -Exist @@ -304,7 +312,7 @@ Describe "Haskell" -Skip:($os.IsHighSierra) { It "GHC" { "ghc --version" | Should -ReturnZeroExitCode } - + It "Cabal" { "cabal --version" | Should -ReturnZeroExitCode } @@ -327,7 +335,7 @@ Describe "Gcc" -Skip:($os.IsHighSierra) { param ( [string] $GccVersion ) - + "gcc-$GccVersion --version" | Should -ReturnZeroExitCode } } From d4335cc52e0569b7e5ac9720b10ddbecaede0995 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Mon, 21 Sep 2020 11:18:28 +0300 Subject: [PATCH 15/55] set chmod -R 777 /opt --- .../scripts/installers/post-deployment.sh | 11 ++++++++ images/linux/ubuntu1604.json | 25 ++++++++++++------- images/linux/ubuntu1804.json | 25 ++++++++++++------- images/linux/ubuntu2004.json | 7 ++++++ 4 files changed, 50 insertions(+), 18 deletions(-) create mode 100644 images/linux/scripts/installers/post-deployment.sh diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh new file mode 100644 index 000000000..10fe34feb --- /dev/null +++ b/images/linux/scripts/installers/post-deployment.sh @@ -0,0 +1,11 @@ +#!/bin/bash +################################################################################ +## File: post-deployment.sh +## Desc: Post deployment actions +################################################################################ + +# set chmod -R 777 /opt +if [[ -d "/opt" ]]; then + echo "chmod -R 777 /opt" + chmod -R 777 /opt +fi diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index 33263345a..111f87f0d 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -301,15 +301,6 @@ "destination": "{{template_dir}}/Ubuntu1604-README.md", "direction": "download" }, - { - "type": "shell", - "inline": [ - "rm -rf {{user `helper_script_folder`}}", - "rm -rf {{user `installer_script_folder`}}", - "chmod 755 {{user `image_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, { "type": "shell", "scripts":[ @@ -319,6 +310,22 @@ "RUN_VALIDATION={{user `run_validation_diskspace`}}" ] }, + { + "type": "shell", + "scripts":[ + "{{template_dir}}/scripts/installers/post-deployment.sh" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, + { + "type": "shell", + "inline": [ + "rm -rf {{user `helper_script_folder`}}", + "rm -rf {{user `installer_script_folder`}}", + "chmod 755 {{user `image_folder`}}" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, { "type": "file", "source": "{{template_dir}}/config/ubuntu1604.conf", diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 1dd62bc2d..d62de1e48 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -305,15 +305,6 @@ "destination": "{{template_dir}}/Ubuntu1804-README.md", "direction": "download" }, - { - "type": "shell", - "inline": [ - "rm -rf {{user `helper_script_folder`}}", - "rm -rf {{user `installer_script_folder`}}", - "chmod 755 {{user `image_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, { "type": "shell", "scripts":[ @@ -323,6 +314,22 @@ "RUN_VALIDATION={{user `run_validation_diskspace`}}" ] }, + { + "type": "shell", + "scripts":[ + "{{template_dir}}/scripts/installers/post-deployment.sh" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, + { + "type": "shell", + "inline": [ + "rm -rf {{user `helper_script_folder`}}", + "rm -rf {{user `installer_script_folder`}}", + "chmod 755 {{user `image_folder`}}" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, { "type": "file", "source": "{{template_dir}}/config/ubuntu1804.conf", diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index 67d6e1d6a..5a0f77609 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -316,6 +316,13 @@ "RUN_VALIDATION={{user `run_validation_diskspace`}}" ] }, + { + "type": "shell", + "scripts":[ + "{{template_dir}}/scripts/installers/post-deployment.sh" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, { "type": "shell", "inline": [ From 6a33354485a62a2d62a50600150133e5fdae5efa Mon Sep 17 00:00:00 2001 From: Nikita Bykov Date: Mon, 21 Sep 2020 12:05:58 +0300 Subject: [PATCH 16/55] improved documentation for Android on macOS --- .../SoftwareReport.Android.psm1 | 199 ++++++++---------- .../SoftwareReport.Generator.ps1 | 44 +--- 2 files changed, 94 insertions(+), 149 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Android.psm1 b/images/macos/software-report/SoftwareReport.Android.psm1 index 8145b248f..c64e0ad61 100644 --- a/images/macos/software-report/SoftwareReport.Android.psm1 +++ b/images/macos/software-report/SoftwareReport.Android.psm1 @@ -1,7 +1,3 @@ -Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" - -$os = Get-OSVersion - function Split-TableRowByColumns { param( [string] $Row @@ -9,17 +5,6 @@ function Split-TableRowByColumns { return $Row.Split("|") | ForEach-Object { $_.trim() } } -function Build-AndroidTableObject { - param( - [string] $PackageName, - [string] $Description - ) - return [PSCustomObject] @{ - "Package Name" = $PackageName - "Description" = $Description - } -} - function Get-AndroidSDKRoot { return Join-Path $env:HOME "Library" "Android" "sdk" } @@ -43,124 +28,122 @@ function Get-AndroidInstalledPackages { return $androidInstalledPackages } -function Build-AndroidSDKToolsTable { + +function Build-AndroidTable { + Write-Host "Build-AndroidTable" + $packageInfo = Get-AndroidInstalledPackages + Write-Host $packageInfo + return @( + @{ + "Package" = "Android SDK Tools" + "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android SDK Tools" + }, + @{ + "Package" = "Android SDK Platforms" + "Version" = Get-AndroidPlatformVersions -PackageInfo $packageInfo + }, + @{ + "Package" = "Android SDK Build-tools" + "Version" = Get-AndroidBuildToolVersions -PackageInfo $packageInfo + }, + @{ + "Package" = "Android SDK Platform-Tools" + "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android SDK Platform-Tools" + }, + @{ + "Package" = "Google APIs" + "Version" = Get-AndroidGoogleAPIsVersions -PackageInfo $packageInfo + }, + @{ + "Package" = "Android Support Repository" + "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android Support Repository" + }, + @{ + "Package" = "Google Play services" + "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Google Play services" + }, + @{ + "Package" = "Google Repository" + "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Google Repository" + }, + @{ + "Package" = "SDK Patch Applier v4" + "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "SDK Patch Applier v4" + }, + @{ + "Package" = "CMake" + "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "cmake" + }, + @{ + "Package" = "NDK" + "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "ndk-bundle" + } + ) | Where-Object { $_.Version } | ForEach-Object { + [PSCustomObject] @{ + "Package Name" = $_.Package + "Version" = $_.Version + } + } +} + +function Get-AndroidPackageVersions { param ( [Parameter(Mandatory)] - [object] $packageInfo + [object] $PackageInfo, + [Parameter(Mandatory)] + [object] $MatchedString ) - - return $packageInfo | ForEach-Object { + + $versions = $packageInfo | Where-Object { $_ -Match $MatchedString } | ForEach-Object { $packageInfoParts = Split-TableRowByColumns $_ - $packageName = $packageInfoParts[0] - $packageDescription = $packageInfoParts[2] + ", Revision " + $packageInfoParts[1] - return Build-AndroidTableObject -PackageName $packageName -Description $packageDescription + return $packageInfoParts[1] } + return ($versions -Join "
") } -function Build-AndroidSDKPlatformTable { +function Get-AndroidPlatformVersions { param ( [Parameter(Mandatory)] - [object] $packageInfo + [object] $PackageInfo ) - return $packageInfo | ForEach-Object { + $versions = $packageInfo | Where-Object { $_ -Match "Android SDK Platform " } | ForEach-Object { $packageInfoParts = Split-TableRowByColumns $_ - $packageName = $packageInfoParts[0].split(";")[1] - $packageDescription = $packageInfoParts[2] + ", Revision " + $packageInfoParts[1] - return Build-AndroidTableObject -PackageName $packageName -Description $packageDescription + $revision = $packageInfoParts[1] + $version = $packageInfoParts[0].split(";")[1] + return "$version (rev $revision)" } + [array]::Reverse($versions) + return ($versions -Join "
") } -function Build-AndroidSDKBuildToolsTable { +function Get-AndroidBuildToolVersions { param ( [Parameter(Mandatory)] - [object] $packageInfo + [object] $PackageInfo ) - return $packageInfo | ForEach-Object { + $versions = $packageInfo | Where-Object { $_ -Match "Android SDK Build-Tools" } | ForEach-Object { $packageInfoParts = Split-TableRowByColumns $_ - $packageName = $packageInfoParts[0].replace(";", "-") - $packageDescription = "Android SDK Build-Tools, Revision " + $packageInfoParts[1] - return Build-AndroidTableObject -PackageName $packageName -Description $packageDescription + return $packageInfoParts[1] } + $groupVersions = @() + $versions | ForEach-Object { + $majorVersion = $_.Split(".")[0] + $groupVersions += $versions | Where-Object { $_.StartsWith($majorVersion) } | Join-String -Separator " " + } + return ($groupVersions | Sort-Object -Descending -Unique | Join-String -Separator "
") } -function Build-AndroidNDKTable { +function Get-AndroidGoogleAPIsVersions { param ( - [Parameter(Mandatory)][AllowEmptyString()] - [string[]] $installedPackages + [Parameter(Mandatory)] + [object] $PackageInfo ) - $ndkInfo = @() - - if ($os.IsLessThanBigSur) { - $ndkInfo += [PSCustomObject] @{ - # Hardcode NDK 15 as a separate case since it is installed manually without sdk-manager (to none default location) - "Version" = "15.2.4203891" - "Path" = Join-Path (Get-AndroidSDKRoot) "android-ndk-r15c" - } - - $ndkFolderPath = Join-Path (Get-AndroidSDKRoot) "ndk" - $ndkInfo += Get-ChildItem -Path $ndkFolderPath | ForEach-Object { - return [PSCustomObject] @{ - "Version" = $_.Name - "Path" = $_.FullName - } - } - } - - $ndkBundleInfo = $installedPackages | Where-Object { $_ -Match "ndk-bundle" } | Select-Object -First 1 - $ndkBundleVersion = (Split-TableRowByColumns $ndkBundleInfo)[1] - $ndkInfo += [PSCustomObject] @{ - "Version" = $ndkBundleVersion - "Path" = Join-Path (Get-AndroidSDKRoot) "ndk-bundle" - } - - $ndkInfo | ForEach-Object { - $_.Path = $_.Path.Replace($env:HOME, '$HOME') - } - - return $ndkInfo -} - -function Build-AndroidUtilsTable { - param ( - [Parameter(Mandatory)][AllowEmptyString()] - [string[]] $installedPackages - ) - - $utilsList = @("cmake", "Android Emulator") - return $utilsList | ForEach-Object { - $packageName = $_ - $packageInfo = $installedPackages | Where-Object { $_ -Match $packageName } | Select-Object -First 1 - $packageInfoParts = Split-TableRowByColumns $packageInfo - return [PSCustomObject] @{ - "Package Name" = $packageName - "Version" = $packageInfoParts[1] - } - } -} - -function Build-AndroidExtraPackagesTable { - param ( - [Parameter(Mandatory)][AllowEmptyString()] - [string[]] $installedPackages - ) - - $extraPackages = @( - "Android Support Repository", - "Google Play services", - "Google Repository", - "Hardware_Accelerated_Execution_Manager" - ) - - return $extraPackages | ForEach-Object { - $packageId = $_ - $packageInfo = $installedPackages | Where-Object { $_ -Like "*${packageId}*" } | Select-Object -First 1 - $packageInfoParts = Split-TableRowByColumns $packageInfo - return [PSCustomObject] @{ - "Package Name" = $packageInfoParts[2] - "Version" = $packageInfoParts[1] - } + $versions = $packageInfo | Where-Object { $_ -Match "Google APIs" } | ForEach-Object { + $packageInfoParts = Split-TableRowByColumns $_ + return $packageInfoParts[0].split(";")[1] } + return ($versions -Join "
") } \ No newline at end of file diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 9627e24e1..13e4aada1 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -185,9 +185,9 @@ $azureCLIVersion = Run-Command "az -v" | Select-String "^azure-cli" | Take-Part $awsVersion = Run-Command "aws --version" | Take-Part -Part 0 | Take-Part -Delimiter "/" -Part 1 $aliyunVersion = Run-Command "aliyun --version" | Select-String "Alibaba Cloud Command Line Interface Version " | Take-Part -Part 6 $awsSamVersion = Run-Command "sam --version" | Take-Part -Part 3 -$awsSessionManagerVersion = Run-Command "session-manager-plugin --version" +$awsSessionManagerVersion = Run-Command "session-manager-plugin --version" $ghcUpVersion = Run-Command "ghcup --version" | Take-Part -Part 5 -$ghcVersion = Run-Command "ghc --version" | Take-Part -Part 7 +$ghcVersion = Run-Command "ghc --version" | Take-Part -Part 7 $cabalVersion = Run-Command "cabal --version" | Take-Part -Part 3 $stackVersion = Run-Command "stack --version" | Take-Part -Part 1 | ForEach-Object {$_.replace(",","")} @@ -300,45 +300,7 @@ if (-not $os.IsBigSur) { # Android section $markdown += New-MDHeader "Android" -Level 3 -$androidInstalledPackages = Get-AndroidInstalledPackages - -$markdown += New-MDHeader "Android SDK Tools" -Level 4 -$androidSDKTools = $androidInstalledPackages | Where-Object { $_ -Match "Android SDK Tools" } -$markdown += Build-AndroidSDKToolsTable $androidSDKTools | New-MDTable -$markdown += New-MDNewLine - -$markdown += New-MDHeader "Android SDK Platform-Tools" -Level 4 -$androidSDKPlatformTools = $androidInstalledPackages | Where-Object { $_ -Match "Android SDK Platform-Tools" } -$markdown += Build-AndroidSDKToolsTable $androidSDKPlatformTools | New-MDTable -$markdown += New-MDNewLine - -$markdown += New-MDHeader "Android SDK Platforms" -Level 4 -$androidSDKPlatforms = $androidInstalledPackages | Where-Object { $_ -Match "Android SDK Platform " } -$markdown += Build-AndroidSDKPlatformTable $androidSDKPlatforms | New-MDTable -$markdown += New-MDNewLine - -$markdown += New-MDHeader "Android SDK Build-Tools" -Level 4 -$androidSDKBuildTools = $androidInstalledPackages | Where-Object { $_ -Match "Android SDK Build-Tools" } -$markdown += Build-AndroidSDKBuildtoolsTable $androidSDKBuildTools | New-MDTable -$markdown += New-MDNewLine - -$markdown += New-MDHeader "Android NDKs" -Level 4 -$markdown += Build-AndroidNDKTable $androidInstalledPackages | New-MDTable -$markdown += New-MDNewLine - -$markdown += New-MDHeader "Android Utils" -Level 4 -$markdown += Build-AndroidUtilsTable $androidInstalledPackages | New-MDTable -$markdown += New-MDNewLine - -$androidGoogleAPIsTable = $androidInstalledPackages | Where-Object { $_ -Match "Google APIs" } -if ($androidGoogleAPIsTable.Count -gt 0) { - $markdown += New-MDHeader "Android Google APIs" -Level 4 - $markdown += Build-AndroidSDKPlatformTable $androidGoogleAPIsTable | New-MDTable - $markdown += New-MDNewLine -} - -$markdown += New-MDHeader "Extra Packages" -Level 4 -$markdown += Build-AndroidExtraPackagesTable $androidInstalledPackages | New-MDTable +$markdown += Build-AndroidTable | New-MDTable $markdown += New-MDNewLine # From c7b8aca60e4d79f39af56981061b3b25062c2dab Mon Sep 17 00:00:00 2001 From: Nikita Bykov Date: Mon, 21 Sep 2020 14:55:25 +0300 Subject: [PATCH 17/55] update --- .../SoftwareReport.Android.psm1 | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/images/macos/software-report/SoftwareReport.Android.psm1 b/images/macos/software-report/SoftwareReport.Android.psm1 index c64e0ad61..cb71f3db7 100644 --- a/images/macos/software-report/SoftwareReport.Android.psm1 +++ b/images/macos/software-report/SoftwareReport.Android.psm1 @@ -76,7 +76,7 @@ function Build-AndroidTable { }, @{ "Package" = "NDK" - "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "ndk-bundle" + "Version" = Build-AndroidNDKTable -PackageInfo $packageInfo } ) | Where-Object { $_.Version } | ForEach-Object { [PSCustomObject] @{ @@ -146,4 +146,29 @@ function Get-AndroidGoogleAPIsVersions { return $packageInfoParts[0].split(";")[1] } return ($versions -Join "
") +} + +function Build-AndroidNDKTable { + param ( + [Parameter(Mandatory)][AllowEmptyString()] + [string[]] $installedPackages + ) + + if ($os.IsLessThanBigSur) { + # Hardcode NDK 15 as a separate case since it is installed manually without sdk-manager (to none default location) + $versions = "15.2.4203891" + + $ndkFolderPath = Join-Path (Get-AndroidSDKRoot) "ndk" + $versions += Get-ChildItem -Path $ndkFolderPath | ForEach-Object + } + + $ndkBundleInfo = $installedPackages | Where-Object { $_ -Match "ndk-bundle" } | Select-Object -First 1 + $ndkBundleVersion = (Split-TableRowByColumns $ndkBundleInfo)[1] + $ndkInfo += $ndkBundleVersion + + # $ndkInfo | ForEach-Object { + # $_.Path = $_.Path.Replace($env:HOME, '$HOME') + # } + + return $ndkInfo } \ No newline at end of file From 0a8bab60939015b32e3f9b7c259aefb8d177d432 Mon Sep 17 00:00:00 2001 From: Chris Gavin Date: Mon, 21 Sep 2020 15:37:02 +0100 Subject: [PATCH 18/55] Touch a file required to indicate to the toolcache that CodeQL is fully set up. --- images/linux/scripts/installers/codeql-bundle.sh | 3 +++ images/win/scripts/Installers/Install-CodeQLBundle.ps1 | 3 +++ 2 files changed, 6 insertions(+) diff --git a/images/linux/scripts/installers/codeql-bundle.sh b/images/linux/scripts/installers/codeql-bundle.sh index 825ce0708..9de8a5e41 100644 --- a/images/linux/scripts/installers/codeql-bundle.sh +++ b/images/linux/scripts/installers/codeql-bundle.sh @@ -21,5 +21,8 @@ tar -xzf "/tmp/codeql-bundle.tar.gz" -C "$extraction_directory" # Touch a special file that indicates to the CodeQL Action that this bundle was baked-in to the hosted runner images. touch "$extraction_directory/pinned-version" +# Touch a file to indicate to the toolcache that setting up CodeQL is complete. +touch "$extraction_directory.complete" + # Test that the tool has been extracted successfully. "$AGENT_TOOLSDIRECTORY/CodeQL/$codeql_bundle_version/x64/codeql/codeql" version diff --git a/images/win/scripts/Installers/Install-CodeQLBundle.ps1 b/images/win/scripts/Installers/Install-CodeQLBundle.ps1 index d8f21f0df..d9f273775 100644 --- a/images/win/scripts/Installers/Install-CodeQLBundle.ps1 +++ b/images/win/scripts/Installers/Install-CodeQLBundle.ps1 @@ -21,5 +21,8 @@ Extract-7Zip -Path $UnGzipedCodeQLBundlePath -DestinationPath $ExtractionDirecto # Touch a special file that indicates to the CodeQL Action that this bundle was baked-in to the hosted runner images. New-Item -ItemType file (Join-Path $ExtractionDirectory -ChildPath "pinned-version") +# Touch a file to indicate to the toolcache that setting up CodeQL is complete. +New-Item -ItemType file "$ExtractionDirectory.complete" + # Test that the tool has been extracted successfully. Invoke-PesterTests -TestFile "Tools" -TestName "CodeQLBundle" From 42827c5d7f0e54b0ec8a4627aa29cc15f9b2b8ff Mon Sep 17 00:00:00 2001 From: Hutson Betts Date: Mon, 21 Sep 2020 13:24:05 -0500 Subject: [PATCH 19/55] refactor: auto format JSON using VSC --- images/linux/ubuntu1604.json | 20 ++++---- images/linux/ubuntu1804.json | 20 ++++---- images/linux/ubuntu2004.json | 20 ++++---- images/win/Windows2016-Azure.json | 74 ++++++++++++++++-------------- images/win/Windows2019-Azure.json | 76 ++++++++++++++++--------------- 5 files changed, 112 insertions(+), 98 deletions(-) diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index 33263345a..f354443dd 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -24,7 +24,10 @@ "run_validation_diskspace": "false", "announcements": "{{env `ANNOUNCEMENTS`}}" }, - "sensitive-variables": ["client_secret", "github_feed_token"], + "sensitive-variables": [ + "client_secret", + "github_feed_token" + ], "builders": [ { "type": "azure-arm", @@ -32,7 +35,6 @@ "client_secret": "{{user `client_secret`}}", "subscription_id": "{{user `subscription_id`}}", "tenant_id": "{{user `tenant_id`}}", - "location": "{{user `location`}}", "vm_size": "{{user `vm_size`}}", "resource_group_name": "{{user `resource_group`}}", @@ -62,7 +64,7 @@ }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/base/repos.sh" ], "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" @@ -104,7 +106,7 @@ }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/installers/preimagedata.sh" ], "environment_vars": [ @@ -217,7 +219,7 @@ }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/installers/Install-Toolset.ps1", "{{template_dir}}/scripts/installers/Configure-Toolset.ps1", "{{template_dir}}/scripts/installers/Validate-Toolset.ps1" @@ -269,14 +271,14 @@ }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/installers/cleanup.sh" ], "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/installers/Install-PowerShellModules.ps1" ], "environment_vars": [ @@ -289,7 +291,7 @@ "inline": [ "pwsh -File {{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1 -OutputDirectory {{user `image_folder`}}" ], - "environment_vars":[ + "environment_vars": [ "IMAGE_VERSION={{user `image_version`}}", "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", "ANNOUNCEMENTS={{user `announcements`}}" @@ -312,7 +314,7 @@ }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/installers/validate-disk-space.sh" ], "environment_vars": [ diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 1dd62bc2d..c7f495a41 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -24,7 +24,10 @@ "run_validation_diskspace": "false", "announcements": "{{env `ANNOUNCEMENTS`}}" }, - "sensitive-variables": ["client_secret", "github_feed_token"], + "sensitive-variables": [ + "client_secret", + "github_feed_token" + ], "builders": [ { "type": "azure-arm", @@ -32,7 +35,6 @@ "client_secret": "{{user `client_secret`}}", "subscription_id": "{{user `subscription_id`}}", "tenant_id": "{{user `tenant_id`}}", - "location": "{{user `location`}}", "vm_size": "{{user `vm_size`}}", "resource_group_name": "{{user `resource_group`}}", @@ -62,7 +64,7 @@ }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/base/repos.sh" ], "environment_vars": [ @@ -107,7 +109,7 @@ }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/installers/preimagedata.sh" ], "environment_vars": [ @@ -221,7 +223,7 @@ }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/installers/Install-Toolset.ps1", "{{template_dir}}/scripts/installers/Configure-Toolset.ps1", "{{template_dir}}/scripts/installers/Validate-Toolset.ps1" @@ -273,14 +275,14 @@ }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/installers/cleanup.sh" ], "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/installers/Install-PowerShellModules.ps1" ], "environment_vars": [ @@ -293,7 +295,7 @@ "inline": [ "pwsh -File {{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1 -OutputDirectory {{user `image_folder`}}" ], - "environment_vars":[ + "environment_vars": [ "IMAGE_VERSION={{user `image_version`}}", "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", "ANNOUNCEMENTS={{user `announcements`}}" @@ -316,7 +318,7 @@ }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/installers/validate-disk-space.sh" ], "environment_vars": [ diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index 67d6e1d6a..5bc469db2 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -26,7 +26,10 @@ "go_versions": "1.14", "announcements": "{{env `ANNOUNCEMENTS`}}" }, - "sensitive-variables": ["client_secret", "github_feed_token"], + "sensitive-variables": [ + "client_secret", + "github_feed_token" + ], "builders": [ { "type": "azure-arm", @@ -34,7 +37,6 @@ "client_secret": "{{user `client_secret`}}", "subscription_id": "{{user `subscription_id`}}", "tenant_id": "{{user `tenant_id`}}", - "location": "{{user `location`}}", "vm_size": "{{user `vm_size`}}", "resource_group_name": "{{user `resource_group`}}", @@ -64,7 +66,7 @@ }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/base/repos.sh" ], "environment_vars": [ @@ -109,7 +111,7 @@ }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/installers/preimagedata.sh" ], "environment_vars": [ @@ -223,7 +225,7 @@ }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/installers/Install-Toolset.ps1", "{{template_dir}}/scripts/installers/Configure-Toolset.ps1", "{{template_dir}}/scripts/installers/Validate-Toolset.ps1" @@ -275,14 +277,14 @@ }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/installers/cleanup.sh" ], "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/installers/Install-PowerShellModules.ps1" ], "environment_vars": [ @@ -295,7 +297,7 @@ "inline": [ "pwsh -File {{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1 -OutputDirectory {{user `image_folder`}}" ], - "environment_vars":[ + "environment_vars": [ "IMAGE_VERSION={{user `image_version`}}", "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", "ANNOUNCEMENTS={{user `announcements`}}" @@ -309,7 +311,7 @@ }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/installers/validate-disk-space.sh" ], "environment_vars": [ diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json index 6aa1423c6..1bb889993 100644 --- a/images/win/Windows2016-Azure.json +++ b/images/win/Windows2016-Azure.json @@ -15,7 +15,6 @@ "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", "vm_size": "Standard_DS4_v2", "run_scan_antivirus": "false", - "root_folder": "C:", "toolset_json_path": "{{env `TEMP`}}\\toolset.json", "image_folder": "C:\\image", @@ -30,7 +29,11 @@ "github_feed_token": "{{env `GITHUB_FEED_TOKEN`}}", "announcements": "{{env `ANNOUNCEMENTS`}}" }, - "sensitive-variables": ["install_password", "client_secret", "github_feed_token"], + "sensitive-variables": [ + "install_password", + "client_secret", + "github_feed_token" + ], "builders": [ { "name": "vhd", @@ -65,7 +68,7 @@ "provisioners": [ { "type": "powershell", - "inline":[ + "inline": [ "New-Item -Path {{user `image_folder`}} -ItemType Directory -Force" ] }, @@ -97,7 +100,7 @@ { "type": "windows-shell", "inline": [ - "net user {{user `install_user`}} {{user `install_password`}} /add /passwordchg:no /passwordreq:yes /active:yes /Y" , + "net user {{user `install_user`}} {{user `install_password`}} /add /passwordchg:no /passwordreq:yes /active:yes /Y", "net localgroup Administrators {{user `install_user`}} /add", "winrm set winrm/config/service/auth @{Basic=\"true\"}", "winrm get winrm/config/service/auth" @@ -116,7 +119,7 @@ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}" ], - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-PowerShellModules.ps1", "{{ template_dir }}/scripts/Installers/Initialize-VM.ps1", "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1" @@ -125,7 +128,7 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1", "{{ template_dir }}/scripts/Installers/Install-ContainersFeature.ps1" ] @@ -137,8 +140,8 @@ { "type": "powershell", "inline": [ - "setx ImageVersion {{user `image_version` }} /m", - "setx ImageOS {{user `image_os` }} /m" + "setx ImageVersion {{user `image_version` }} /m", + "setx ImageOS {{user `image_os` }} /m" ] }, { @@ -147,7 +150,7 @@ "IMAGE_VERSION={{user `image_version`}}", "IMAGEDATA_FILE={{user `imagedata_file`}}" ], - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Update-ImageData.ps1", "{{ template_dir }}/scripts/Installers/Install-Docker.ps1", "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1" @@ -159,7 +162,7 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Update-DockerImages.ps1" ] }, @@ -169,10 +172,10 @@ 0, 3010 ], - "environment_vars":[ + "environment_vars": [ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" ], - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-VS.ps1", "{{ template_dir }}/scripts/Installers/Install-NET48.ps1", "{{ template_dir }}/scripts/Installers/Windows2016/Install-SSDT.ps1" @@ -182,10 +185,10 @@ }, { "type": "powershell", - "environment_vars":[ + "environment_vars": [ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" ], - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-Nuget.ps1", "{{ template_dir }}/scripts/Installers/Install-Wix.ps1", "{{ template_dir }}/scripts/Installers/Install-WDK.ps1", @@ -194,7 +197,7 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-ServiceFabricSDK.ps1" ], "execution_policy": "remotesigned" @@ -205,7 +208,7 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzCopy.ps1", @@ -221,12 +224,12 @@ }, { "type": "powershell", - "environment_vars":[ + "environment_vars": [ "GITHUB_FEED_TOKEN={{ user `github_feed_token` }}", "TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "ROOT_FOLDER={{user `root_folder`}}" ], - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Download-ToolCache.ps1", "{{ template_dir }}/scripts/Installers/Install-PyPy.ps1", "{{ template_dir }}/scripts/Installers/Install-Toolset.ps1", @@ -237,7 +240,7 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-Sbt.ps1", "{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1", "{{ template_dir }}/scripts/Installers/Install-Perl.ps1", @@ -256,7 +259,7 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1" ], "elevated_user": "{{user `install_user`}}", @@ -264,21 +267,23 @@ }, { "type": "windows-shell", - "inline": ["wmic product where \"name like '%%microsoft azure powershell%%'\" call uninstall /nointeractive"] + "inline": [ + "wmic product where \"name like '%%microsoft azure powershell%%'\" call uninstall /nointeractive" + ] }, { "type": "powershell", - "environment_vars":[ + "environment_vars": [ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}" ], - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1" ] }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-VSWhere.ps1", "{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1", "{{ template_dir }}/scripts/Installers/Install-Cmake.ps1", @@ -290,18 +295,17 @@ "{{ template_dir }}/scripts/Installers/Install-DotnetSDK.ps1" ] }, - { "type": "powershell", "elevated_user": "SYSTEM", "elevated_password": "", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-Msys2.ps1" ] }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-Mingw64.ps1", "{{ template_dir }}/scripts/Installers/Install-TypeScript.ps1", "{{ template_dir }}/scripts/Installers/Install-Haskell.ps1", @@ -324,7 +328,7 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-WindowsUpdates.ps1", "{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1" ], @@ -337,10 +341,10 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Tests/RunAll-Tests.ps1" ], - "environment_vars":[ + "environment_vars": [ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}", "ROOT_FOLDER={{user `root_folder`}}" @@ -351,7 +355,7 @@ "inline": [ "pwsh -File '{{user `image_folder`}}\\SoftwareReport\\SoftwareReport.Generator.ps1'" ], - "environment_vars":[ + "environment_vars": [ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "ANNOUNCEMENTS={{user `announcements`}}" ] @@ -364,7 +368,7 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Finalize-VM.ps1" ] }, @@ -374,16 +378,16 @@ }, { "type": "powershell", - "environment_vars":[ + "environment_vars": [ "RUN_SCAN_ANTIVIRUS={{user `run_scan_antivirus`}}" ], - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Run-Antivirus.ps1" ] }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1", "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1" ] diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json index 515caba9d..7f32c9980 100644 --- a/images/win/Windows2019-Azure.json +++ b/images/win/Windows2019-Azure.json @@ -15,7 +15,6 @@ "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", "vm_size": "Standard_D4_v2", "run_scan_antivirus": "false", - "root_folder": "C:", "toolset_json_path": "{{env `TEMP`}}\\toolset.json", "image_folder": "C:\\image", @@ -30,7 +29,11 @@ "github_feed_token": "{{env `GITHUB_FEED_TOKEN`}}", "announcements": "{{env `ANNOUNCEMENTS`}}" }, - "sensitive-variables": ["install_password", "client_secret", "github_feed_token"], + "sensitive-variables": [ + "install_password", + "client_secret", + "github_feed_token" + ], "builders": [ { "name": "vhd", @@ -65,7 +68,7 @@ "provisioners": [ { "type": "powershell", - "inline":[ + "inline": [ "New-Item -Path {{user `image_folder`}} -ItemType Directory -Force" ] }, @@ -97,7 +100,7 @@ { "type": "windows-shell", "inline": [ - "net user {{user `install_user`}} {{user `install_password`}} /add /passwordchg:no /passwordreq:yes /active:yes /Y" , + "net user {{user `install_user`}} {{user `install_password`}} /add /passwordchg:no /passwordreq:yes /active:yes /Y", "net localgroup Administrators {{user `install_user`}} /add", "winrm set winrm/config/service/auth @{Basic=\"true\"}", "winrm get winrm/config/service/auth" @@ -116,7 +119,7 @@ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}" ], - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-PowerShellModules.ps1", "{{ template_dir }}/scripts/Installers/Initialize-VM.ps1", "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1" @@ -127,13 +130,13 @@ "type": "powershell", "elevated_user": "SYSTEM", "elevated_password": "", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Windows2019/Install-WSL.ps1" ] }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1", "{{ template_dir }}/scripts/Installers/Install-ContainersFeature.ps1" ] @@ -141,8 +144,8 @@ { "type": "powershell", "inline": [ - "setx ImageVersion {{user `image_version` }} /m", - "setx ImageOS {{user `image_os` }} /m" + "setx ImageVersion {{user `image_version` }} /m", + "setx ImageOS {{user `image_os` }} /m" ] }, { @@ -155,7 +158,7 @@ "IMAGE_VERSION={{user `image_version`}}", "IMAGEDATA_FILE={{user `imagedata_file`}}" ], - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Update-ImageData.ps1", "{{ template_dir }}/scripts/Installers/Install-Docker.ps1", "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1" @@ -167,7 +170,7 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Update-DockerImages.ps1" ] }, @@ -177,10 +180,10 @@ 0, 3010 ], - "environment_vars":[ + "environment_vars": [ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" ], - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-VS.ps1", "{{ template_dir }}/scripts/Installers/Install-NET48.ps1" ], @@ -189,10 +192,10 @@ }, { "type": "powershell", - "environment_vars":[ + "environment_vars": [ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" ], - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-Nuget.ps1", "{{ template_dir }}/scripts/Installers/Install-Wix.ps1", "{{ template_dir }}/scripts/Installers/Install-WDK.ps1", @@ -209,7 +212,7 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-ServiceFabricSDK.ps1" ], "execution_policy": "remotesigned" @@ -220,38 +223,39 @@ }, { "type": "powershell", - "environment_vars":[ + "environment_vars": [ "GITHUB_FEED_TOKEN={{ user `github_feed_token` }}", "ROOT_FOLDER={{user `root_folder`}}" ], - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Download-ToolCache.ps1" ] }, { "type": "windows-shell", - "inline": ["wmic product where \"name like '%%microsoft azure powershell%%'\" call uninstall /nointeractive"] + "inline": [ + "wmic product where \"name like '%%microsoft azure powershell%%'\" call uninstall /nointeractive" + ] }, { "type": "powershell", - "environment_vars":[ + "environment_vars": [ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "ROOT_FOLDER={{user `root_folder`}}", "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}" ], - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-PyPy.ps1", "{{ template_dir }}/scripts/Installers/Install-Toolset.ps1", "{{ template_dir }}/scripts/Installers/Configure-Toolset.ps1", "{{ template_dir }}/scripts/Installers/Install-YAMLLint.ps1", "{{ template_dir }}/scripts/Installers/Update-AndroidSDK.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1" - ] }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1", "{{ template_dir }}/scripts/Installers/Install-Perl.ps1", "{{ template_dir }}/scripts/Installers/Install-Git.ps1", @@ -270,7 +274,7 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1" ], "elevated_user": "{{user `install_user`}}", @@ -280,13 +284,13 @@ "type": "powershell", "elevated_user": "SYSTEM", "elevated_password": "", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-Msys2.ps1" ] }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-VSWhere.ps1", "{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1", "{{ template_dir }}/scripts/Installers/Install-Cmake.ps1", @@ -322,7 +326,7 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-WindowsUpdates.ps1", "{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1" ], @@ -335,10 +339,10 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Tests/RunAll-Tests.ps1" ], - "environment_vars":[ + "environment_vars": [ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}", "ROOT_FOLDER={{user `root_folder`}}" @@ -349,7 +353,7 @@ "inline": [ "pwsh -File '{{user `image_folder`}}\\SoftwareReport\\SoftwareReport.Generator.ps1'" ], - "environment_vars":[ + "environment_vars": [ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "ANNOUNCEMENTS={{user `announcements`}}" ] @@ -362,7 +366,7 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Finalize-VM.ps1" ] }, @@ -372,28 +376,28 @@ }, { "type": "powershell", - "environment_vars":[ + "environment_vars": [ "RUN_SCAN_ANTIVIRUS={{user `run_scan_antivirus`}}" ], - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Run-Antivirus.ps1" ] }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1" ] }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1" ] }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Run-NGen.ps1" ] }, From c3ca91a185565d2ce1a9b94419cadce13fecb30c Mon Sep 17 00:00:00 2001 From: Nikita Bykov Date: Tue, 22 Sep 2020 09:46:44 +0300 Subject: [PATCH 20/55] added Get-AndroidNDKVersions function --- .../SoftwareReport.Android.psm1 | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Android.psm1 b/images/macos/software-report/SoftwareReport.Android.psm1 index cb71f3db7..75f1d9f86 100644 --- a/images/macos/software-report/SoftwareReport.Android.psm1 +++ b/images/macos/software-report/SoftwareReport.Android.psm1 @@ -32,7 +32,6 @@ function Get-AndroidInstalledPackages { function Build-AndroidTable { Write-Host "Build-AndroidTable" $packageInfo = Get-AndroidInstalledPackages - Write-Host $packageInfo return @( @{ "Package" = "Android SDK Tools" @@ -76,7 +75,7 @@ function Build-AndroidTable { }, @{ "Package" = "NDK" - "Version" = Build-AndroidNDKTable -PackageInfo $packageInfo + "Version" = Get-AndroidNDKVersions -PackageInfo $packageInfo } ) | Where-Object { $_.Version } | ForEach-Object { [PSCustomObject] @{ @@ -148,27 +147,29 @@ function Get-AndroidGoogleAPIsVersions { return ($versions -Join "
") } -function Build-AndroidNDKTable { +function Get-AndroidNDKVersions { param ( [Parameter(Mandatory)][AllowEmptyString()] - [string[]] $installedPackages + [string[]] $packageInfo ) + $os = Get-OSVersion + $versions = @() + if ($os.IsLessThanBigSur) { # Hardcode NDK 15 as a separate case since it is installed manually without sdk-manager (to none default location) - $versions = "15.2.4203891" + $versions += "15.2.4203891" $ndkFolderPath = Join-Path (Get-AndroidSDKRoot) "ndk" - $versions += Get-ChildItem -Path $ndkFolderPath | ForEach-Object + Get-ChildItem -Path $ndkFolderPath | ForEach-Object { + $versions += $_.Name + } } - $ndkBundleInfo = $installedPackages | Where-Object { $_ -Match "ndk-bundle" } | Select-Object -First 1 - $ndkBundleVersion = (Split-TableRowByColumns $ndkBundleInfo)[1] - $ndkInfo += $ndkBundleVersion + $versions += $packageInfo | Where-Object { $_ -Match "ndk-bundle" } | ForEach-Object { + $packageInfoParts = Split-TableRowByColumns $_ + return $packageInfoParts[1] + } - # $ndkInfo | ForEach-Object { - # $_.Path = $_.Path.Replace($env:HOME, '$HOME') - # } - - return $ndkInfo + return ($versions -Join "
") } \ No newline at end of file From 6986bb8008905424d8c2b140323b841a783f97a8 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Tue, 22 Sep 2020 10:44:51 +0300 Subject: [PATCH 21/55] set condition to install .51 instead of .60 --- images/win/scripts/Installers/Install-Edge.ps1 | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/images/win/scripts/Installers/Install-Edge.ps1 b/images/win/scripts/Installers/Install-Edge.ps1 index ada5eaacb..888a9285e 100644 --- a/images/win/scripts/Installers/Install-Edge.ps1 +++ b/images/win/scripts/Installers/Install-Edge.ps1 @@ -17,15 +17,21 @@ Write-Host "Get the Microsoft Edge WebDriver version..." $RegistryPath = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths" $EdgePath = (Get-ItemProperty "$RegistryPath\msedge.exe").'(default)' [version]$EdgeVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($EdgePath).ProductVersion -#$EdgeDriverVersionUrl = "https://msedgedriver.azureedge.net/LATEST_RELEASE_$($EdgeVersion.Major)" +$EdgeDriverVersionUrl = "https://msedgedriver.azureedge.net/LATEST_RELEASE_$($EdgeVersion.Major)" -#$EdgeDriverVersionFile = Start-DownloadWithRetry -Url $EdgeDriverVersionUrl -Name "versioninfo.txt" -DownloadPath $EdgeDriverPath -Add-Content -Path "${EdgeDriverPath}\versioninfo.txt" -Value "85.0.564.51" +$EdgeDriverVersionFile = Start-DownloadWithRetry -Url $EdgeDriverVersionUrl -Name "versioninfo.txt" -DownloadPath $EdgeDriverPath Write-Host "Download Microsoft Edge WebDriver..." $EdgeDriverLatestVersion = Get-Content -Path "${EdgeDriverPath}\versioninfo.txt" $EdgeDriverArchName = "edgedriver_win64.zip" -$EdgeDriverDownloadUrl="https://msedgedriver.azureedge.net/${EdgeDriverLatestVersion}/${EdgeDriverArchName}" +# A temporary workaround to install the previous driver version because 85.0.564.60 for win64 doesn't exist +if ($EdgeDriverLatestVersion -eq "85.0.564.60") +{ + $EdgeDriverLatestVersion = "85.0.564.51" + Set-Content -Path "${EdgeDriverPath}\versioninfo.txt" -Value $EdgeDriverLatestVersion +} + +$EdgeDriverDownloadUrl = "https://msedgedriver.azureedge.net/${EdgeDriverLatestVersion}/${EdgeDriverArchName}" $EdgeDriverArchPath = Start-DownloadWithRetry -Url $EdgeDriverDownloadUrl -Name $EdgeDriverArchName From 3a47b604fd3117c9db6d99fcd0ffc74dd263e0c2 Mon Sep 17 00:00:00 2001 From: zaanposni Date: Tue, 22 Sep 2020 09:46:15 +0200 Subject: [PATCH 22/55] fixes #1633 , using azure module, adjusted documentation --- help/CreateImageAndAzureResources.md | 3 ++- helpers/GenerateResourcesAndImage.ps1 | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/help/CreateImageAndAzureResources.md b/help/CreateImageAndAzureResources.md index 123d335cf..3401c1fce 100644 --- a/help/CreateImageAndAzureResources.md +++ b/help/CreateImageAndAzureResources.md @@ -12,6 +12,7 @@ After successful image generation, a snapshot of the temporary VM will be conver - `packer` - Can be downloaded from https://www.packer.io/downloads - `PowerShell 5.0 or higher` or `PSCore` for linux distributes. - `Azure CLI ` - https://docs.microsoft.com/en-us/cli/azure/install-azure-cli?view=azure-cli-latest +- `Azure Powershell module` - https://docs.microsoft.com/en-us/powershell/azure/install-az-ps?view=azps-4.6.1 ### Azure DevOps self-hosted pool requirements To connect to a temporary VM packer use WinRM or SSH connections on public IP interfaces. @@ -31,7 +32,7 @@ Download `packer` from https://www.packer.io/downloads, or install it via Chocol choco install packer ``` -Install Azure CLI - https://docs.microsoft.com/ru-ru/cli/azure/install-azure-cli-windows?view=azure-cli-latest&tabs=azure-cli. +Install Azure CLI - https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-windows?view=azure-cli-latest&tabs=azure-cli. ``` Invoke-WebRequest -Uri https://aka.ms/installazurecliwindows -OutFile .\AzureCLI.msi; Start-Process msiexec.exe -Wait -ArgumentList '/I AzureCLI.msi /quiet'; rm .\AzureCLI.msi ``` diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 321770949..31d48ee65 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -110,12 +110,12 @@ Function GenerateResourcesAndImage { $ServicePrincipalClientSecret = $env:UserName + [System.GUID]::NewGuid().ToString().ToUpper(); $InstallPassword = $env:UserName + [System.GUID]::NewGuid().ToString().ToUpper(); - Login-AzureRmAccount - Set-AzureRmContext -SubscriptionId $SubscriptionId + Connect-AzAccount + Set-AzContext -SubscriptionId $SubscriptionId $alreadyExists = $true; try { - Get-AzureRmResourceGroup -Name $ResourceGroupName + Get-AzResourceGroup -Name $ResourceGroupName Write-Verbose "Resource group was found, will delete and recreate it." } catch { @@ -126,8 +126,8 @@ Function GenerateResourcesAndImage { if ($alreadyExists) { if($Force -eq $true) { # Cleanup the resource group if it already exitsted before - Remove-AzureRmResourceGroup -Name $ResourceGroupName -Force - New-AzureRmResourceGroup -Name $ResourceGroupName -Location $AzureLocation + Remove-AzResourceGroup -Name $ResourceGroupName -Force + New-AzResourceGroup -Name $ResourceGroupName -Location $AzureLocation } else { $title = "Delete Resource Group" $message = "The resource group you specified already exists. Do you want to clean it up?" @@ -146,13 +146,13 @@ Function GenerateResourcesAndImage { switch ($result) { - 0 { Remove-AzureRmResourceGroup -Name $ResourceGroupName -Force; New-AzureRmResourceGroup -Name $ResourceGroupName -Location $AzureLocation } + 0 { Remove-AzResourceGroup -Name $ResourceGroupName -Force; New-AzResourceGroup -Name $ResourceGroupName -Location $AzureLocation } 1 { <# Do nothing #> } 2 { exit } } } } else { - New-AzureRmResourceGroup -Name $ResourceGroupName -Location $AzureLocation + New-AzResourceGroup -Name $ResourceGroupName -Location $AzureLocation } # This script should follow the recommended naming conventions for azure resources @@ -164,19 +164,19 @@ Function GenerateResourcesAndImage { $storageAccountName = $storageAccountName.Replace("-", "").Replace("_", "").Replace("(", "").Replace(")", "").ToLower() $storageAccountName += "001" - New-AzureRmStorageAccount -ResourceGroupName $ResourceGroupName -AccountName $storageAccountName -Location $AzureLocation -SkuName "Standard_LRS" + New-AzStorageAccount -ResourceGroupName $ResourceGroupName -AccountName $storageAccountName -Location $AzureLocation -SkuName "Standard_LRS" $spDisplayName = [System.GUID]::NewGuid().ToString().ToUpper() - $sp = New-AzureRmADServicePrincipal -DisplayName $spDisplayName -Password (ConvertTo-SecureString $ServicePrincipalClientSecret -AsPlainText -Force) + $sp = New-AzADServicePrincipal -DisplayName $spDisplayName -Password (ConvertTo-SecureString $ServicePrincipalClientSecret -AsPlainText -Force) $spAppId = $sp.ApplicationId $spClientId = $sp.ApplicationId $spObjectId = $sp.Id Start-Sleep -Seconds $SecondsToWaitForServicePrincipalSetup - New-AzureRmRoleAssignment -RoleDefinitionName Contributor -ServicePrincipalName $spAppId + New-AzRoleAssignment -RoleDefinitionName Contributor -ServicePrincipalName $spAppId Start-Sleep -Seconds $SecondsToWaitForServicePrincipalSetup - $sub = Get-AzureRmSubscription -SubscriptionId $SubscriptionId + $sub = Get-AzSubscription -SubscriptionId $SubscriptionId $tenantId = $sub.TenantId # "", "Note this variable-setting script for running Packer with these Azure resources in the future:", "==============================================================================================", "`$spClientId = `"$spClientId`"", "`$ServicePrincipalClientSecret = `"$ServicePrincipalClientSecret`"", "`$SubscriptionId = `"$SubscriptionId`"", "`$tenantId = `"$tenantId`"", "`$spObjectId = `"$spObjectId`"", "`$AzureLocation = `"$AzureLocation`"", "`$ResourceGroupName = `"$ResourceGroupName`"", "`$storageAccountName = `"$storageAccountName`"", "`$install_password = `"$install_password`"", "" From e5a5a6cc39933885987c09767de50d255dfba228 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Tue, 22 Sep 2020 10:50:32 +0300 Subject: [PATCH 23/55] fix path --- images/win/scripts/Installers/Install-Edge.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-Edge.ps1 b/images/win/scripts/Installers/Install-Edge.ps1 index 888a9285e..1f4ce0ae4 100644 --- a/images/win/scripts/Installers/Install-Edge.ps1 +++ b/images/win/scripts/Installers/Install-Edge.ps1 @@ -22,13 +22,13 @@ $EdgeDriverVersionUrl = "https://msedgedriver.azureedge.net/LATEST_RELEASE_$($Ed $EdgeDriverVersionFile = Start-DownloadWithRetry -Url $EdgeDriverVersionUrl -Name "versioninfo.txt" -DownloadPath $EdgeDriverPath Write-Host "Download Microsoft Edge WebDriver..." -$EdgeDriverLatestVersion = Get-Content -Path "${EdgeDriverPath}\versioninfo.txt" +$EdgeDriverLatestVersion = Get-Content -Path $EdgeDriverVersionFile $EdgeDriverArchName = "edgedriver_win64.zip" # A temporary workaround to install the previous driver version because 85.0.564.60 for win64 doesn't exist if ($EdgeDriverLatestVersion -eq "85.0.564.60") { $EdgeDriverLatestVersion = "85.0.564.51" - Set-Content -Path "${EdgeDriverPath}\versioninfo.txt" -Value $EdgeDriverLatestVersion + Set-Content -Path $EdgeDriverVersionFile -Value $EdgeDriverLatestVersion } $EdgeDriverDownloadUrl = "https://msedgedriver.azureedge.net/${EdgeDriverLatestVersion}/${EdgeDriverArchName}" From 0d663601b655b25824db345b0b20413bbd512a31 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Tue, 22 Sep 2020 11:25:51 +0300 Subject: [PATCH 24/55] Check environment variables --- images.CI/macos/azure-pipelines/image-generation.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml index 490cbda6d..4798c73fa 100644 --- a/images.CI/macos/azure-pipelines/image-generation.yml +++ b/images.CI/macos/azure-pipelines/image-generation.yml @@ -13,6 +13,10 @@ jobs: clean: true fetchDepth: 1 + - pwsh: | + Get-ChildItem Env: + exit 1 + - task: PowerShell@2 displayName: 'Validate contributor permissions' condition: startsWith(variables['Build.SourceBranch'], 'refs/pull/') From d0524e9381ba12bb4a7c8ee8173bd7e9e8c7ea43 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Tue, 22 Sep 2020 12:12:44 +0300 Subject: [PATCH 25/55] exclude R and virtualbox --- images/macos/provision/core/commonutils.sh | 19 +++++++++++++------ .../SoftwareReport.Generator.ps1 | 16 +++++++++++----- images/macos/tests/Common.Tests.ps1 | 18 +++++++++--------- 3 files changed, 33 insertions(+), 20 deletions(-) diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index 2f2a18ce5..7bd55dfd7 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -40,12 +40,19 @@ for package in ${binst_common_utils[@]}; do done # brew cask install -bcask_common_utils=( - julia - virtualbox - vagrant - r -) +if is_BigSur; then + bcask_common_utils=( + julia + vagrant + ) +else + bcask_common_utils=( + julia + virtualbox + vagrant + r + ) +fi for package in ${bcask_common_utils[@]}; do echo "Install $package" diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index b8a5283cc..eed6c06e7 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -55,6 +55,10 @@ if ( -not $os.IsHighSierra) { $markdown += New-MDList -Style Unordered -NoNewLine -Lines $lines } +if ($os.IsLessThanBigSur) { + $markdown += New-MDList -Style Unordered -Lines @(Get-RVersion) -NoNewLine +} + $markdown += New-MDList -Style Unordered -Lines @( "Node.js ${nodejsVersion}" "NVM ${nvmVersion}" @@ -63,7 +67,6 @@ $markdown += New-MDList -Style Unordered -Lines @( $python3Version, "Ruby ${rubyVersion}", (Get-DotnetVersionList), - (Get-RVersion), "Go ${goVersion}", "$phpVersion", "$juliaVersion" @@ -139,7 +142,6 @@ $bazelVersion = Run-Command "bazel --version" | Take-Part -Part 0 -Delimiter "-" $bazeliskVersion = Run-Command "bazelisk version" | Select-String "Bazelisk version:" | Take-Part -Part 1 -Delimiter ":" $packerVersion = Run-Command "packer --version" $helmVersion = Run-Command "helm version --short" -$vbox = Run-Command "vboxmanage -v" $vagrant = Run-Command "vagrant -v" $mongo = Run-Command "mongo --version" | Select-String "MongoDB shell version" | Take-Part -Part 3 $mongod = Run-Command "mongod --version" | Select-String "db version " | Take-Part -Part 2 @@ -177,8 +179,12 @@ if ($os.IsHigherThanMojave) { $markdown += New-MDList -Lines "Newman $newmanVersion" -Style Unordered -NoNewLine } if ($os.IsLessThanBigSur) { + $vbox = Run-Command "vboxmanage -v" $parallelVersion = Run-Command "parallel --version" | Select-String "GNU parallel" | Select-Object -First 1 - $markdown += New-MDList -Lines $parallelVersion -Style Unordered + $markdown += New-MDList -Style Unordered -Lines @( + $vbox + $parallelVersion + ) } $markdown += New-MDNewLine @@ -190,9 +196,9 @@ $azureCLIVersion = Run-Command "az -v" | Select-String "^azure-cli" | Take-Part $awsVersion = Run-Command "aws --version" | Take-Part -Part 0 | Take-Part -Delimiter "/" -Part 1 $aliyunVersion = Run-Command "aliyun --version" | Select-String "Alibaba Cloud Command Line Interface Version " | Take-Part -Part 6 $awsSamVersion = Run-Command "sam --version" | Take-Part -Part 3 -$awsSessionManagerVersion = Run-Command "session-manager-plugin --version" +$awsSessionManagerVersion = Run-Command "session-manager-plugin --version" $ghcUpVersion = Run-Command "ghcup --version" | Take-Part -Part 5 -$ghcVersion = Run-Command "ghc --version" | Take-Part -Part 7 +$ghcVersion = Run-Command "ghc --version" | Take-Part -Part 7 $cabalVersion = Run-Command "cabal --version" | Take-Part -Part 3 $stackVersion = Run-Command "stack --version" | Take-Part -Part 1 | ForEach-Object {$_.replace(",","")} diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index 3e61a9a81..505c57368 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -103,7 +103,7 @@ Describe "Common utilities" { $result = Get-CommandResult "gem list" $result.Output | Should -BeLike "*nomad-cli*" } - + It "Nomad CLI IPA" { "ipa --version" | Should -ReturnZeroExitCode } @@ -163,7 +163,7 @@ Describe "Common utilities" { It "PostgreSQL-Client" { "psql --version" | Should -ReturnZeroExitCode } - + It "PostgreSQL-Server" { "pg_config --version" | Should -ReturnZeroExitCode } @@ -180,11 +180,11 @@ Describe "Common utilities" { Get-WhichTool "php" | Should -Not -BeLike "/usr/bin/php*" "php --version" | Should -ReturnZeroExitCode } - + It "Composer" { "composer --version" | Should -ReturnZeroExitCode } - + It "R" -Skip:($os.IsBigSur) { "R --version" | Should -ReturnZeroExitCode } @@ -200,7 +200,7 @@ Describe "Common utilities" { It "bazelisk" { "bazelisk version" | Should -ReturnZeroExitCode } - + It "Julia" { "julia --version" | Should -ReturnZeroExitCode } @@ -213,7 +213,7 @@ Describe "Common utilities" { "helm version --short" | Should -ReturnZeroExitCode } - It "virtualbox" { + It "virtualbox" -Skip:($os.IsBigSur) { "vboxmanage -v" | Should -ReturnZeroExitCode } @@ -254,7 +254,7 @@ Describe "Browsers" { It "Microsoft Edge Driver" { "msedgedriver --version" | Should -ReturnZeroExitCode } - + It "Firefox" { $firefoxLocation = "/Applications/Firefox.app/Contents/MacOS/firefox" $firefoxLocation | Should -Exist @@ -306,7 +306,7 @@ Describe "Haskell" -Skip:($os.IsHighSierra) { It "GHC" { "ghc --version" | Should -ReturnZeroExitCode } - + It "Cabal" { "cabal --version" | Should -ReturnZeroExitCode } @@ -329,7 +329,7 @@ Describe "Gcc" -Skip:($os.IsHighSierra) { param ( [string] $GccVersion ) - + "gcc-$GccVersion --version" | Should -ReturnZeroExitCode } } From 907a61cd2fb01af3aed01d1f66148582163c11d2 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Tue, 22 Sep 2020 12:30:15 +0300 Subject: [PATCH 26/55] exclude vagrant --- images/macos/provision/core/commonutils.sh | 1 - images/macos/software-report/SoftwareReport.Generator.ps1 | 7 +++---- images/macos/tests/Common.Tests.ps1 | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index 7bd55dfd7..439a01065 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -43,7 +43,6 @@ done if is_BigSur; then bcask_common_utils=( julia - vagrant ) else bcask_common_utils=( diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index eed6c06e7..9a8ada4a4 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -142,7 +142,6 @@ $bazelVersion = Run-Command "bazel --version" | Take-Part -Part 0 -Delimiter "-" $bazeliskVersion = Run-Command "bazelisk version" | Select-String "Bazelisk version:" | Take-Part -Part 1 -Delimiter ":" $packerVersion = Run-Command "packer --version" $helmVersion = Run-Command "helm version --short" -$vagrant = Run-Command "vagrant -v" $mongo = Run-Command "mongo --version" | Select-String "MongoDB shell version" | Take-Part -Part 3 $mongod = Run-Command "mongod --version" | Select-String "db version " | Take-Part -Part 2 $p7zip = Run-Command "7z i" | Select-String "7-Zip" | Take-Part -Part 0,2 @@ -168,10 +167,8 @@ $markdown += New-MDList -Style Unordered -NoNewLine -Lines @( $bazelVersion, "bazelisk $($bazeliskVersion.Trim())", "helm $helmVersion", - "virtualbox $vbox", "mongo $mongo", "mongod $mongod", - "$vagrant", $p7zip ) if ($os.IsHigherThanMojave) { @@ -179,10 +176,12 @@ if ($os.IsHigherThanMojave) { $markdown += New-MDList -Lines "Newman $newmanVersion" -Style Unordered -NoNewLine } if ($os.IsLessThanBigSur) { + $vagrant = Run-Command "vagrant -v" $vbox = Run-Command "vboxmanage -v" $parallelVersion = Run-Command "parallel --version" | Select-String "GNU parallel" | Select-Object -First 1 $markdown += New-MDList -Style Unordered -Lines @( - $vbox + "virtualbox $vbox", + $vagrant, $parallelVersion ) } diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index 505c57368..b6c5b099b 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -217,7 +217,7 @@ Describe "Common utilities" { "vboxmanage -v" | Should -ReturnZeroExitCode } - It "vagrant" { + It "vagrant" -Skip:($os.IsBigSur) { "vagrant --version" | Should -ReturnZeroExitCode } From adf9c70bd92b5004b4f10ca9a3e93b35366655d0 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Tue, 22 Sep 2020 12:32:31 +0300 Subject: [PATCH 27/55] package condition --- images/macos/provision/core/commonutils.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index 439a01065..9d05bcfb5 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -40,13 +40,11 @@ for package in ${binst_common_utils[@]}; do done # brew cask install -if is_BigSur; then - bcask_common_utils=( - julia - ) -else - bcask_common_utils=( - julia +bcask_common_utils=( + julia +) +if is_Less_BigSur; then + bcask_common_utils+=( virtualbox vagrant r From 49763bcc9da89d62b4ebf4fdfee4abdd5c870c43 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Tue, 22 Sep 2020 12:33:10 +0300 Subject: [PATCH 28/55] new line --- images/macos/provision/core/commonutils.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index 9d05bcfb5..9b32d5c2c 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -43,6 +43,7 @@ done bcask_common_utils=( julia ) + if is_Less_BigSur; then bcask_common_utils+=( virtualbox From 9a48139d0e372c299f06972b43d035f91a9550c3 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Tue, 22 Sep 2020 12:54:47 +0300 Subject: [PATCH 29/55] add attempts --- images.CI/macos/azure-pipelines/image-generation.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml index 4798c73fa..7f02d90f9 100644 --- a/images.CI/macos/azure-pipelines/image-generation.yml +++ b/images.CI/macos/azure-pipelines/image-generation.yml @@ -7,16 +7,14 @@ jobs: variables: - group: Mac-Cloud Image Generation - group: Mac-Cloud Image Generation Key Vault + - name: VirtualMachineName + value: $(Build.BuildNumber).$(System.JobAttempt) steps: - checkout: self clean: true fetchDepth: 1 - - pwsh: | - Get-ChildItem Env: - exit 1 - - task: PowerShell@2 displayName: 'Validate contributor permissions' condition: startsWith(variables['Build.SourceBranch'], 'refs/pull/') @@ -60,7 +58,7 @@ jobs: -var="output_folder=$(output-folder)" ` -var="vm_username=$(vm-username)" ` -var="vm_password=$(vm-password)" ` - -var="build_id=$(Build.BuildNumber)" ` + -var="build_id=${{ variables.VirtualMachineName }}" ` -var="baseimage_name=${{ parameters.base_image_name }}" ` -var="github_feed_token=$(github-feed-token)" ` -var="xcode_install_user=$(xcode-installation-user)" ` @@ -87,7 +85,7 @@ jobs: ls $(Common.TestResultsDirectory) echo "Put VM name to 'VM_Done_Name' file" - echo "$(Build.BuildNumber)" > "$(Build.ArtifactStagingDirectory)/VM_Done_Name" + echo "${{ variables.VirtualMachineName }}" > "$(Build.ArtifactStagingDirectory)/VM_Done_Name" displayName: Prepare artifact - bash: | From fe9f74e51ed37a716f61a7e9de6286bf57ef55c8 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Tue, 22 Sep 2020 13:55:21 +0300 Subject: [PATCH 30/55] rm helper and installer folder in post-deployment --- .../scripts/installers/post-deployment.sh | 5 ++++ images/linux/ubuntu1604.json | 28 ++++++++----------- images/linux/ubuntu1804.json | 28 ++++++++----------- images/linux/ubuntu2004.json | 28 ++++++++----------- 4 files changed, 41 insertions(+), 48 deletions(-) diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh index 10fe34feb..2864dae4f 100644 --- a/images/linux/scripts/installers/post-deployment.sh +++ b/images/linux/scripts/installers/post-deployment.sh @@ -9,3 +9,8 @@ if [[ -d "/opt" ]]; then echo "chmod -R 777 /opt" chmod -R 777 /opt fi + +# remove installer and helper folders +rm -rf $HELPER_SCRIPT_FOLDER +rm -rf $INSTALLER_SCRIPT_FOLDER +chmod 755 $IMAGE_FOLDER diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index 111f87f0d..3aa477cb6 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -301,6 +301,18 @@ "destination": "{{template_dir}}/Ubuntu1604-README.md", "direction": "download" }, + { + "type": "shell", + "scripts":[ + "{{template_dir}}/scripts/installers/post-deployment.sh" + ], + "environment_vars":[ + "HELPER_SCRIPT_FOLDER={{user `helper_script_folder`}}", + "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", + "IMAGE_FOLDER={{user `image_folder`}}" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, { "type": "shell", "scripts":[ @@ -310,22 +322,6 @@ "RUN_VALIDATION={{user `run_validation_diskspace`}}" ] }, - { - "type": "shell", - "scripts":[ - "{{template_dir}}/scripts/installers/post-deployment.sh" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "inline": [ - "rm -rf {{user `helper_script_folder`}}", - "rm -rf {{user `installer_script_folder`}}", - "chmod 755 {{user `image_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, { "type": "file", "source": "{{template_dir}}/config/ubuntu1604.conf", diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index d62de1e48..a5b71c07b 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -305,6 +305,18 @@ "destination": "{{template_dir}}/Ubuntu1804-README.md", "direction": "download" }, + { + "type": "shell", + "scripts":[ + "{{template_dir}}/scripts/installers/post-deployment.sh" + ], + "environment_vars":[ + "HELPER_SCRIPT_FOLDER={{user `helper_script_folder`}}", + "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", + "IMAGE_FOLDER={{user `image_folder`}}" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, { "type": "shell", "scripts":[ @@ -314,22 +326,6 @@ "RUN_VALIDATION={{user `run_validation_diskspace`}}" ] }, - { - "type": "shell", - "scripts":[ - "{{template_dir}}/scripts/installers/post-deployment.sh" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "inline": [ - "rm -rf {{user `helper_script_folder`}}", - "rm -rf {{user `installer_script_folder`}}", - "chmod 755 {{user `image_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, { "type": "file", "source": "{{template_dir}}/config/ubuntu1804.conf", diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index 5a0f77609..c2a1bd561 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -307,6 +307,18 @@ "destination": "{{template_dir}}/Ubuntu2004-README.md", "direction": "download" }, + { + "type": "shell", + "scripts":[ + "{{template_dir}}/scripts/installers/post-deployment.sh" + ], + "environment_vars":[ + "HELPER_SCRIPT_FOLDER={{user `helper_script_folder`}}", + "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", + "IMAGE_FOLDER={{user `image_folder`}}" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, { "type": "shell", "scripts":[ @@ -316,22 +328,6 @@ "RUN_VALIDATION={{user `run_validation_diskspace`}}" ] }, - { - "type": "shell", - "scripts":[ - "{{template_dir}}/scripts/installers/post-deployment.sh" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "inline": [ - "rm -rf {{user `helper_script_folder`}}", - "rm -rf {{user `installer_script_folder`}}", - "chmod 755 {{user `image_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, { "type": "file", "source": "{{template_dir}}/config/ubuntu2004.conf", From 13b9879c7efe4dddd031f7458320e898e5686271 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Thu, 24 Sep 2020 11:09:23 +0300 Subject: [PATCH 31/55] add ANDROID_SDK_ROOT to windows --- images/win/scripts/Installers/Update-AndroidSDK.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/images/win/scripts/Installers/Update-AndroidSDK.ps1 b/images/win/scripts/Installers/Update-AndroidSDK.ps1 index 5eeac22fc..b5b9a67f7 100644 --- a/images/win/scripts/Installers/Update-AndroidSDK.ps1 +++ b/images/win/scripts/Installers/Update-AndroidSDK.ps1 @@ -71,6 +71,7 @@ $ndkRoot = "C:\Program Files (x86)\Android\android-sdk\ndk-bundle" if (Test-Path $ndkRoot) { setx ANDROID_HOME $sdkRoot /M + setx ANDROID_SDK_ROOT $sdkRoot /M setx ANDROID_NDK_HOME $ndkRoot /M setx ANDROID_NDK_PATH $ndkRoot /M } else { From 046a1e5b713612a0699d13bd2b267cb67dfdf8db Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Thu, 24 Sep 2020 11:19:02 +0300 Subject: [PATCH 32/55] add ANDROID_SDK_ROOT to macOS --- images/macos/provision/configuration/environment/bashrc | 1 + 1 file changed, 1 insertion(+) diff --git a/images/macos/provision/configuration/environment/bashrc b/images/macos/provision/configuration/environment/bashrc index 26fd14327..92fe36d3d 100644 --- a/images/macos/provision/configuration/environment/bashrc +++ b/images/macos/provision/configuration/environment/bashrc @@ -3,6 +3,7 @@ export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 export ANDROID_HOME=${HOME}/Library/Android/sdk +export ANDROID_SDK_ROOT=${HOME}/Library/Android/sdk export ANDROID_NDK_HOME=${ANDROID_HOME}/ndk-bundle export NUNIT_BASE_PATH=/Library/Developer/nunit From b2f9e51d7e904494146d51d9d15a67391c4c6162 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Sep 2020 09:08:26 +0000 Subject: [PATCH 33/55] Updating readme file for ubuntu20 version 20200920.1 (#1628) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 520 ++++++++++++------------------ 1 file changed, 205 insertions(+), 315 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 8f33731ff..2776b988a 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,325 +1,215 @@ - | Announcements | |-| +| [Default Python will be switched to 3.8 on Ubuntu 20.04 on October, 6](https://github.com/actions/virtual-environments/issues/1591) | | [Clang/LLVM 10 will be set as a default one and Clang/LLVM 6 will be deprecated for Ubuntu 20.04 on September, 23](https://github.com/actions/virtual-environments/issues/1536) | *** # Ubuntu 20.04.1 LTS -The following software is installed on machines with the 20200914.1 update. -*** -- 7-Zip 16.02 -- Ansible (ansible 2.9.6) -- AzCopy7 (available by azcopy alias) 7.3.0 -- AzCopy10 (available by azcopy10 alias) 10.6.0 -- Azure CLI (azure-cli 2.11.1) -- Azure CLI (azure-devops 0.18.0) -- Basic packages: - - dbus - - dnsutils - - dpkg - - fakeroot - - gnupg2 - - iproute2 - - iputils-ping - - lib32z1 - - libc++abi-dev - - libc++-dev - - libcurl4 - - libgbm-dev - - libgconf-2-4 - - libgtk-3-0 - - libsecret-1-dev - - libsqlite3-dev - - libunwind8 - - libxkbfile-dev - - libxss1 - - locales - - openssh-client - - pkg-config - - python-is-python2 - - rpm - - texinfo - - tk - - tzdata - - upx - - xorriso - - xvfb - - xz-utils - - zstd - - zsync - - bison - - brotli - - bzip2 - - curl - - file - - flex - - ftp - - jq - - m4 - - netcat - - parallel - - patchelf - - rsync - - shellcheck - - sqlite3 - - ssh - - sudo - - telnet - - time - - unzip - - wget - - yamllint - - zip -- Alibaba Cloud CLI (3.0.56) -- AWS CLI (aws-cli/2.0.48 Python/3.7.3 Linux/5.4.0-1025-azure exe/x86_64.ubuntu.20) -- AWS CLI Session manager plugin (1.1.61.0) -- build-essential -- Clang 6.0 (6.0.1) -- Clang 8 (8.0.1) -- Clang 9 (9.0.1) -- Swift version 5.2.5 (swift-5.2.5-RELEASE) -Target: x86_64-unknown-linux-gnu -- CMake (cmake version 3.17.0) -- Podman (2.0.6) -- Buildah (1.15.2) -- Skopeo (1.1.1) -- Docker Compose (docker-compose version 1.27.2, build 18f557f9) -- Docker-Moby (Docker version 19.03.12+azure, build 0ed913b885c8919944a2e4c8d0b80a318a8dd48b) -- Docker-Buildx (0.4.2+azure) -- Cached container images - - node:10 (Digest: sha256:ab6f988c514b5c5fb6d5a6d18afb216084b256719791c6cc61096da58e66c436) - - node:12 (Digest: sha256:20ffb04c1d35e273dc7aa68fe31ef136630d95128689283a8eb914329158022b) - - buildpack-deps:stretch (Digest: sha256:4f72cea5afa05e21bf2aec93b219b0843a10af5e2f407cc184f211e45f929ccc) - - buildpack-deps:buster (Digest: sha256:8a76b9f9ee417eb330e97d3129e373277515e98d0f3a95a89ab944b645190efd) - - debian:9 (Digest: sha256:bc125c699d736ac84c92b76ab7028741bbac69f207b7a8a4065bca6f79d5698e) - - debian:8 (Digest: sha256:e180975d5c1012518e711c92ab26a4ff98218f439a97d9adbcd503b0d3ad1c8a) - - jekyll/builder:latest (Digest: sha256:4bc6a3b6eddebef1652ef38ceb965fc9c1b06677f65f764e1e17b88dc2aa9934) - - node:12-alpine (Digest: sha256:9623cd396644f9b2e595d833dc0188a880333674488d939338ab5fde10ef7c43) - - node:10-alpine (Digest: sha256:2f202af4d6baba655fef9c93f41a914b33ee576b9f55a6e69ba23b49e3b62766) - - alpine:3.9 (Digest: sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011) - - alpine:3.10 (Digest: sha256:f0e9534a598e501320957059cb2a23774b4d4072e37c7b2cf7e95b241f019e35) - - alpine:3.8 (Digest: sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14) - - ubuntu:14.04 (Digest: sha256:ffc76f71dd8be8c9e222d420dc96901a07b61616689a44c7b3ef6a10b7213de4) - - alpine:3.7 (Digest: sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10) - - mcr.microsoft.com/azure-pipelines/node8-typescript:latest (Digest: sha256:e52e60b9f71183969830a3664279b5d8c799b4b0ec2c25a0686f7c02f6a9669a) -- .NET Core SDK: - - 3.1.402 - - 3.1.401 - - 3.1.302 - - 3.1.301 - - 3.1.300 - - 3.1.202 - - 3.1.201 - - 3.1.200 - - 3.1.108 - - 3.1.107 - - 3.1.106 - - 3.1.105 - - 3.1.104 - - 3.1.103 - - 3.1.102 - - 3.1.101 - - 3.1.100 - - 2.1.810 - - 2.1.809 - - 2.1.808 - - 2.1.807 - - 2.1.806 - - 2.1.805 - - 2.1.804 - - 2.1.803 - - 2.1.802 - - 2.1.801 - - 2.1.701 - - 2.1.700 - - 2.1.615 - - 2.1.614 - - 2.1.613 - - 2.1.612 - - 2.1.611 - - 2.1.610 - - 2.1.609 - - 2.1.608 - - 2.1.607 - - 2.1.606 - - 2.1.605 - - 2.1.604 - - 2.1.603 - - 2.1.602 - - 2.1.518 - - 2.1.517 - - 2.1.516 - - 2.1.515 - - 2.1.514 - - 2.1.513 - - 2.1.512 - - 2.1.511 - - 2.1.510 - - 2.1.509 - - 2.1.508 - - 2.1.507 - - 2.1.506 - - 2.1.505 - - 2.1.504 - - 2.1.503 - - 2.1.502 - - 2.1.500 - - 2.1.403 - - 2.1.402 - - 2.1.401 - - 2.1.302 - - 2.1.301 - - 2.1.300 -- Erlang (Erlang (SMP,ASYNC_THREADS,HIPE) (BEAM) emulator version 11.0.3) -- Firefox (Mozilla Firefox 80.0.1) -- Geckodriver (0.27.0); Gecko Driver is available via GECKOWEBDRIVER environment variable -- GNU C++ 7.5.0 -- GNU C++ 8.4.0 -- GNU C++ 9.3.0 -- GNU Fortran 8.4.0 -- GNU Fortran 9.3.0 -- Git (2.28.0) -- Git Large File Storage (LFS) (2.12.0) -- Git-ftp (1.6.0) -- Hub CLI (2.14.2) -- GitHub CLI 0.12.0 -- Google Chrome (Google Chrome 85.0.4183.102 ) -- ChromeDriver 85.0.4183.87 (cd6713ebf92fa1cacc0f1a598df280093af0c5d7-refs/branch-heads/4183@{#1689}); Chrome Driver is available via CHROMEWEBDRIVER environment variable -- Google Cloud SDK (309.0.0) -- Haskell Cabal (cabal-install version 3.4.0.0 -compiled using version 3.4.0.0 of the Cabal library ) -- GHC (The Glorious Glasgow Haskell Compilation System, version 8.10.2) -- Haskell Stack (Version 2.3.3, Git revision cb44d51bed48b723a5deb08c3348c0b3ccfc437e x86_64 hpack-0.33.0) -- Heroku (heroku/7.42.13 linux-x64 node-v12.16.2) -- HHVM (HipHop VM 4.74.0 (rel)) -- ImageMagick -- Adopt OpenJDK: - - 8 (openjdk version "1.8.0_265") - - 11 (openjdk version "11.0.8" 2020-07-14) (default) -- Ant (Apache Ant(TM) version 1.10.7 compiled on October 24 2019) +- Image Version: 20200920.1 + +## Installed Software +### Language and Runtime +- GNU C++ 7.5.0, 8.4.0, 9.3.0 +- GNU Fortran 8.4.0, 9.3.0 +- Clang 10.0.1, 8.0.1, 9.0.1 +- Erlang 11.0.3 +- Mono 6.12.0.90 +- Node 12.18.4 +- Python 2.7.18rc1 +- Python3 3.8.2 +- PowerShell 7.0.3 +- Ruby 2.7.0p0 +- Swift 5.3 +- Julia 1.5.1 + +### Package Management +- Homebrew 2.5.1 +- Gem 3.1.2 +- Miniconda 4.8.3 +- Helm 3.3.3 +- Npm 6.14.8 +- Yarn 1.22.5 +- Pip 20.2.3 +- Pip3 20.0.2 +- Vcpkg 2020.06.15 + +### Project Management +- Ant 1.10.7 - Gradle 6.6.1 -- Maven (Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f)) -- Kind (kind v0.8.1 go1.14.2 linux/amd64) -- kubectl (Client Version: v1.19.1) -- helm (v3.3.1+g249e521) -- minikube version: v1.13.0 -- kustomize ({kustomize/v3.8.2 2020-08-29T17:44:01Z }) -- oc CLI Client Version: 4.5.0-202005291417-9933eb9 -- Leiningen (Leiningen 2.9.4 on Java 11.0.8 OpenJDK 64-Bit Server VM) -- Mercurial (Mercurial Distributed SCM (version 5.3.1)) -- Miniconda (conda 4.8.3) -- Mono (Mono JIT compiler version 6.12.0.90 (tarball Fri Sep 4 14:02:38 UTC 2020)) -- NuGet (NuGet Version: 5.5.0.6382) -- MySQL (mysql Ver 8.0.21-0ubuntu0.20.04.4 for Linux on x86_64 ((Ubuntu))) +- Maven 3.6.3 +- Sbt 1.3.13 + +### Tools +- 7-Zip 16.02 +- Ansible 2.9.6 +- AzCopy10 10.6.0 (available by `azcopy10` alias) +- AzCopy7 7.3.0 (available by `azcopy` alias) +- Bazel 3.5.0 +- Bazelisk 1.6.1 +- Buildah 1.16.1 +- CMake 3.17.0 +- curl 7.68.0 +- Docker Compose 1.27.3 +- Docker-Buildx 0.4.2 +- Docker-Moby 19.03.12 +- Git 2.28.0 +- Git LFS 2.12.0 +- Git-ftp 1.6.0 +- Google Cloud SDK 310.0.0 +- Haveged 1.9.1 +- Heroku 7.43.0 +- HHVM (HipHop VM) 4.75.0 +- jq 1.6 +- Kind 0.9.0 +- Kubectl 1.19.2 +- Kustomize 3.8.4 +- Leiningen 2.9.4 +- m4 1.4.18 +- Mercurial 5.3.1 +- Minikube 1.13.0 +- Newman 5.2.0 +- nvm 0.35.3 +- Packer 1.6.2 +- PhantomJS 2.1.1 +- Podman 2.0.6 +- Skopeo 1.1.1 +- SVN 1.13.0 +- Swig 4.0.1 +- Terraform 0.13.3 +- unzip 6.00 +- wget 1.20.3 +- zip 3.0 +- zstd 1.4.4 + +### CLI Tools +- Alibaba Cloud CLI 3.0.59 +- AWS CLI 2.0.50 +- AWS CLI Session manager plugin 1.1.61.0 +- AWS SAM CLI 1.2.0 +- Azure CLI (azure-cli) 2.11.1 +- Azure CLI (azure-devops) 0.18.0 +- GitHub CLI 1.0.0 +- Hub CLI 2.14.2 +- Netlify CLI 2.63.2 +- oc CLI 4.5.0 +- ORAS CLI 0.8.1 +- Vercel CLI 20.1.0 + +### Java +| Version | Vendor | Environment Variable | +| ---------------- | ------------ | -------------------- | +| 1.8.0_265 | AdoptOpenJDK | JAVA_HOME_8_X64 | +| 11.0.8 (default) | AdoptOpenJDK | JAVA_HOME_11_X64 | + +### PHP +| Tool | Version | +| -------- | ------- | +| PHP | 7.4.10 | +| Composer | 1.10.13 | +| PHPUnit | 7.5.20 | + +### Haskell +- GHC 8.10.2 +- Cabal 3.4.0.0 +- Stack 2.3.3 + +### Rust Tools +- Rust 1.46.0 +- Rustup 1.22.1 +- Rustdoc 1.46.0 +- Cargo 1.46.0 + +#### Packages +- Bindgen 0.55.1 +- Cargo audit 0.12.0 +- Cargo outdated 0.9.11 +- Cargo clippy 0.0.212 +- Cbindgen 0.14.5 +- Rustfmt 1.4.18 + +### Browsers and Drivers +- Google Chrome 85.0.4183.102 +- ChromeDriver 85.0.4183.87 +- Mozilla Firefox 80.0.1 +- Geckodriver 0.27.0 + +### .NET Core SDK +- 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 2.1.508 2.1.509 2.1.510 2.1.511 2.1.512 2.1.513 2.1.514 2.1.515 2.1.516 2.1.517 2.1.518 2.1.602 2.1.603 2.1.604 2.1.605 2.1.606 2.1.607 2.1.608 2.1.609 2.1.610 2.1.611 2.1.612 2.1.613 2.1.614 2.1.615 2.1.700 2.1.701 2.1.801 2.1.802 2.1.803 2.1.804 2.1.805 2.1.806 2.1.807 2.1.808 2.1.809 2.1.810 3.1.100 3.1.101 3.1.102 3.1.103 3.1.104 3.1.105 3.1.106 3.1.107 3.1.108 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 + +### Az Module +- 4.6.1 + +### Databases +- Postgre SQL 12.4 +- MongoDB 4.4.1 +- sqlite3 3.31.1 + +#### MySQL +- MySQL 8.0.21 - MySQL Server (user:root password:root) - MS SQL Server Client Tools -- MySQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service' -- nvm (0.35.3) -- Node.js (v12.18.3) -- Grunt (grunt-cli v1.3.2) -- Gulp (CLI version: 2.3.0 -Local version: Unknown) -- n (6.7.0) -- Parcel (1.12.4) -- TypeScript (Version 4.0.2) -- Webpack (4.44.1) -- Webpack CLI (3.3.12) -- Yarn (1.22.5) -- Newman (5.2.0) -- Bazel (bazel 3.5.0) -- Bazelisk (1.6.1) -- ORAS CLI 0.8.1 -- PhantomJS (2.1.1) -- PHP 7.4 (PHP 7.4.10 (cli) (built: Sep 9 2020 06:36:30) ( NTS )) -> To use ppa:ondrej/php APT repository On Ubuntu 20.04 it is necessary to add it to the APT sources + ``` -apt-add-repository ppa:ondrej/php -y -apt-get update + MySQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service' ``` -- Composer (Composer version 1.10.13 2020-09-09 11:46:34) -- PHPUnit (PHPUnit 7.5.20 by Sebastian Bergmann and contributors.) -- Pollinate -- psql (PostgreSQL) 12.4 -- Powershell (PowerShell 7.0.3) -- Pulumi v2.10.0 -- ruby (2.7.0p0) -- gem (3.1.2) -- OpenSSL 1.1.1f 31 Mar 2020 -- Libssl 1.1.1f-1ubuntu2 -- R 4.0.2 -- rustup (1.22.1) -- rust (1.46.0) -- cargo (1.46.0) -- rustfmt (1.4.18-stable) -- clippy (0.0.212) -- rustdoc (1.46.0) -- bindgen (0.55.1) -- cbindgen (0.14.4) -- cargo audit (0.12.0) -- cargo outdated (v0.9.11) -- Julia (julia version 1.5.1) -- sbt (copying runtime jar... -1.3.13) -- Selenium server standalone (available via SELENIUM_JAR_PATH environment variable) -- Sphinx Open Source Search Server -- Subversion (svn, version 1.13.0 (r1867053)) -- Terraform (Terraform v0.13.2) -- Packer (1.6.2) -- Vcpkg 2020.06.15-unknownhash -- Vercel CLI (20.1.0) -- MongoDB on Linux v4.4.1 -- Haveged 1.9.1-6ubuntu1 -- Swig 4.0.1 -- Netlify CLI (netlify-cli/2.63.0 linux-x64 node-v12.18.3) -- Google Repository 58 -- Google Play services 49 -- CMake 3.10.2.4988404 -- Android SDK Platform-Tools 30.0.4 -- Android SDK Platform 30 -- Android SDK Platform 29 -- Android SDK Platform 28 -- Android SDK Platform 27 -- Android SDK Patch Applier v4 -- Android SDK Build-Tools 30.0.2 -- Android SDK Build-Tools 30.0.1 -- Android SDK Build-Tools 30.0.0 -- Android SDK Build-Tools 29.0.3 -- Android SDK Build-Tools 29.0.2 -- Android SDK Build-Tools 29.0.0 -- Android SDK Build-Tools 28.0.3 -- Android SDK Build-Tools 28.0.2 -- Android SDK Build-Tools 28.0.1 -- Android SDK Build-Tools 28.0.0 -- Android SDK Build-Tools 27.0.3 -- Android SDK Build-Tools 27.0.2 -- Android SDK Build-Tools 27.0.1 -- Android SDK Build-Tools 27.0.0 -- Android NDK 21.3.6528147 -- Az Module (4.6.1) -- Ruby: - - Ruby 2.5.8 - - Ruby 2.6.6 - - Ruby 2.7.1 -- Python (Python 2.7.18rc1) -- pip (pip 20.2.3 from /usr/local/lib/python2.7/dist-packages/pip (python 2.7)) -- Python3 (Python 3.8.2) -- pip3 (pip 20.0.2 from /usr/lib/python3/dist-packages/pip (python 3.8)) -- Python: - - Python 2.7.18 - - Python 3.5.10 - - Python 3.6.12 - - Python 3.7.9 - - Python 3.8.5 -- PyPy: - - PyPy 2.7.13 [PyPy 7.3.1 with GCC 7.3.1 20180303 (Red Hat 7.3.1-5)] - - PyPy 3.6.9 [PyPy 7.3.1 with GCC 7.3.1 20180303 (Red Hat 7.3.1-5)] -- node: - - node 8.17.0 - - node 10.22.0 - - node 12.18.3 - - node 14.10.1 -- go: - - go 1.14.9 - - go 1.15.2 -- AWS SAM CLI, version 1.2.0 -- Homebrew on Linux (Homebrew 2.5.1 -Homebrew/linuxbrew-core (git revision d52011; last commit 2020-09-12)) +### Cached Tools +#### Ruby +- 2.5.8 +- 2.6.6 +- 2.7.1 + +#### Python +- 2.7.18 +- 3.5.10 +- 3.6.12 +- 3.7.9 +- 3.8.5 + +#### PyPy +- 2.7.13 [PyPy 7.3.1] +- 3.6.9 [PyPy 7.3.1] + +#### Node.js +- 8.17.0 +- 10.22.1 +- 12.18.4 +- 14.11.0 + +#### Go +- 1.14.9 +- 1.15.2 + +### Android +| Package Name | Version | +| -------------------------- | ---------------------------------------------------------------------------------------------------------- | +| Android SDK Platform-Tools | 30.0.4 | +| Android SDK Tools | 26.1.1 | +| Android SDK Platforms | android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | +| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2
29.0.0 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | +| NDK | 21.3.6528147 | +| Android Support Repository | 47.0.0 | +| Google Play services | 49 | +| Google Repository | 58 | +| SDK Patch Applier v4 | 1 | +| CMake | 3.10.2 | + +### Cached Docker images +- alpine:3.7 +- alpine:3.8 +- alpine:3.9 +- alpine:3.10 +- buildpack-deps:stretch +- buildpack-deps:buster +- debian:8 +- debian:9 +- jekyll/builder +- mcr.microsoft.com/azure-pipelines/node8-typescript +- node:10 +- node:12 +- node:10-alpine +- node:12-alpine +- ubuntu:14.04 + +### Installed apt packages +- bison, brotli, bzip2, curl, dbus, dnsutils, dpkg, fakeroot, file, flex, ftp, gnupg2, iproute2, iputils-ping, jq, lib32z1, libc++-dev, libc++abi-dev, libcurl4, libgbm-dev, libgconf-2-4, libgtk-3-0, libsecret-1-dev, libsqlite3-dev, libunwind8, libxkbfile-dev, libxss1, locales, m4, netcat, openssh-client, parallel, patchelf, pkg-config, python-is-python2, rpm, rsync, shellcheck, sqlite3, ssh, sudo, telnet, texinfo, time, tk, tzdata, unzip, upx, wget, xorriso, xvfb, xz-utils, yamllint, zip, zstd, zsync + + From 7f0d75226f06ecd7e531700625e814841f764ec1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Sep 2020 09:14:42 +0000 Subject: [PATCH 34/55] Updating readme file for ubuntu16 version 20200920.1 (#1625) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1604-README.md | 591 +++++++++++------------------- 1 file changed, 215 insertions(+), 376 deletions(-) diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md index 131c91441..be5b36b92 100644 --- a/images/linux/Ubuntu1604-README.md +++ b/images/linux/Ubuntu1604-README.md @@ -1,384 +1,223 @@ - | Announcements | |-| +| [Default Python will be switched to 3.8 on Ubuntu 20.04 on October, 6](https://github.com/actions/virtual-environments/issues/1591) | | [Clang/LLVM 10 will be set as a default one and Clang/LLVM 6 will be deprecated for Ubuntu 20.04 on September, 23](https://github.com/actions/virtual-environments/issues/1536) | *** # Ubuntu 16.04.7 LTS -The following software is installed on machines with the 20200914.1 update. -*** -- 7-Zip 9.20 -- Ansible (ansible 2.9.13) -- AzCopy7 (available by azcopy alias) 7.3.0 -- AzCopy10 (available by azcopy10 alias) 10.6.0 -- Azure CLI (azure-cli 2.11.1) -- Azure CLI (azure-devops 0.18.0) -- Basic packages: - - dbus - - dnsutils - - dpkg - - fakeroot - - gnupg2 - - iproute2 - - iputils-ping - - lib32z1 - - libc++abi-dev - - libc++-dev - - libcurl3 - - libgbm-dev - - libgconf-2-4 - - libgtk-3-0 - - libicu55 - - libsecret-1-dev - - libsqlite3-dev - - libunwind8 - - libxkbfile-dev - - libxss1 - - locales - - openssh-client - - pkg-config - - rpm - - texinfo - - tk - - tzdata - - upx - - xorriso - - xvfb - - xz-utils - - zstd - - zsync - - bison - - brotli - - bzip2 - - curl - - file - - flex - - ftp - - jq - - m4 - - netcat - - parallel - - patchelf - - rsync - - shellcheck - - sqlite3 - - ssh - - sudo - - telnet - - time - - unzip - - wget - - yamllint - - zip -- Alibaba Cloud CLI (3.0.56) -- AWS CLI (aws-cli/1.18.137 Python/2.7.12 Linux/4.15.0-1095-azure botocore/1.17.60) -- AWS CLI Session manager plugin (1.1.61.0) -- build-essential -- nvm (0.35.3) -- Clang 6.0 (6.0.0) -- Clang 8 (8.0.0) -- Clang 9 (9.0.1) -- Swift version 5.2.5 (swift-5.2.5-RELEASE) -Target: x86_64-unknown-linux-gnu -- CMake (cmake version 3.17.0) -- Docker Compose (docker-compose version 1.27.2, build 18f557f9) -- Docker-Moby (Docker version 19.03.12+azure, build 0ed913b885c8919944a2e4c8d0b80a318a8dd48b) -- Docker-Buildx (0.4.2+azure) -- Cached container images - - node:10 (Digest: sha256:ab6f988c514b5c5fb6d5a6d18afb216084b256719791c6cc61096da58e66c436) - - node:12 (Digest: sha256:20ffb04c1d35e273dc7aa68fe31ef136630d95128689283a8eb914329158022b) - - buildpack-deps:stretch (Digest: sha256:4f72cea5afa05e21bf2aec93b219b0843a10af5e2f407cc184f211e45f929ccc) - - buildpack-deps:buster (Digest: sha256:8a76b9f9ee417eb330e97d3129e373277515e98d0f3a95a89ab944b645190efd) - - debian:9 (Digest: sha256:bc125c699d736ac84c92b76ab7028741bbac69f207b7a8a4065bca6f79d5698e) - - debian:8 (Digest: sha256:e180975d5c1012518e711c92ab26a4ff98218f439a97d9adbcd503b0d3ad1c8a) - - jekyll/builder:latest (Digest: sha256:4bc6a3b6eddebef1652ef38ceb965fc9c1b06677f65f764e1e17b88dc2aa9934) - - node:12-alpine (Digest: sha256:9623cd396644f9b2e595d833dc0188a880333674488d939338ab5fde10ef7c43) - - node:10-alpine (Digest: sha256:2f202af4d6baba655fef9c93f41a914b33ee576b9f55a6e69ba23b49e3b62766) - - alpine:3.9 (Digest: sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011) - - alpine:3.10 (Digest: sha256:f0e9534a598e501320957059cb2a23774b4d4072e37c7b2cf7e95b241f019e35) - - alpine:3.8 (Digest: sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14) - - ubuntu:14.04 (Digest: sha256:ffc76f71dd8be8c9e222d420dc96901a07b61616689a44c7b3ef6a10b7213de4) - - alpine:3.7 (Digest: sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10) - - mcr.microsoft.com/azure-pipelines/node8-typescript:latest (Digest: sha256:e52e60b9f71183969830a3664279b5d8c799b4b0ec2c25a0686f7c02f6a9669a) -- .NET Core SDK: - - 3.1.402 - - 3.1.401 - - 3.1.302 - - 3.1.301 - - 3.1.300 - - 3.1.202 - - 3.1.201 - - 3.1.200 - - 3.1.108 - - 3.1.107 - - 3.1.106 - - 3.1.105 - - 3.1.104 - - 3.1.103 - - 3.1.102 - - 3.1.101 - - 3.1.100 - - 3.0.103 - - 3.0.102 - - 3.0.101 - - 3.0.100 - - 2.1.810 - - 2.1.809 - - 2.1.808 - - 2.1.807 - - 2.1.806 - - 2.1.805 - - 2.1.804 - - 2.1.803 - - 2.1.802 - - 2.1.801 - - 2.1.701 - - 2.1.700 - - 2.1.615 - - 2.1.614 - - 2.1.613 - - 2.1.612 - - 2.1.611 - - 2.1.610 - - 2.1.609 - - 2.1.608 - - 2.1.607 - - 2.1.606 - - 2.1.605 - - 2.1.604 - - 2.1.603 - - 2.1.602 - - 2.1.518 - - 2.1.517 - - 2.1.516 - - 2.1.515 - - 2.1.514 - - 2.1.513 - - 2.1.512 - - 2.1.511 - - 2.1.510 - - 2.1.509 - - 2.1.508 - - 2.1.507 - - 2.1.506 - - 2.1.505 - - 2.1.504 - - 2.1.503 - - 2.1.502 - - 2.1.500 - - 2.1.403 - - 2.1.402 - - 2.1.401 - - 2.1.302 - - 2.1.301 - - 2.1.300 -- Erlang (Erlang (SMP,ASYNC_THREADS,HIPE) (BEAM) emulator version 11.0.3) -- Firefox (Mozilla Firefox 80.0.1) -- Geckodriver (0.27.0); Gecko Driver is available via GECKOWEBDRIVER environment variable -- GNU C++ 7.5.0 -- GNU C++ 8.4.0 -- GNU C++ 9.3.0 -- GNU Fortran 8.4.0 -- GNU Fortran 9.3.0 -- Git (2.28.0) -- Git Large File Storage (LFS) (2.12.0) -- Git-ftp (1.0.2) -- Hub CLI (2.14.2) -- GitHub CLI 0.12.0 -- Google Chrome (Google Chrome 85.0.4183.102 ) -- ChromeDriver 85.0.4183.87 (cd6713ebf92fa1cacc0f1a598df280093af0c5d7-refs/branch-heads/4183@{#1689}); Chrome Driver is available via CHROMEWEBDRIVER environment variable -- Google Cloud SDK (309.0.0) -- Haskell Cabal (cabal-install version 3.4.0.0 -compiled using version 3.4.0.0 of the Cabal library ) -- GHC (The Glorious Glasgow Haskell Compilation System, version 8.10.2) -- Haskell Stack (Version 2.3.3, Git revision cb44d51bed48b723a5deb08c3348c0b3ccfc437e x86_64 hpack-0.33.0) -- Heroku (heroku/7.42.13 linux-x64 node-v12.16.2) -- HHVM (HipHop VM 4.56.1 (rel)) -- ImageMagick -- Azul Zulu OpenJDK: - - 7 (openjdk version "1.7.0_272") -- Adopt OpenJDK: - - 8 (openjdk version "1.8.0_265") (default) - - 11 (openjdk version "11.0.8" 2020-07-14) - - 12 (openjdk version "12.0.2" 2019-07-16) -- Ant (Apache Ant(TM) version 1.9.6 compiled on July 20 2018) +- Image Version: 20200920.1 + +## Installed Software +### Language and Runtime +- GNU C++ 5.5.0, 7.5.0, 8.4.0, 9.3.0 +- GNU Fortran 5.5.0, 8.4.0, 9.3.0 +- Clang 6.0.0, 8.0.0, 9.0.1 +- Erlang 11.0.3 +- Mono 6.12.0.90 +- Node 12.18.4 +- Python 2.7.12 +- Python3 3.5.2 +- PowerShell 7.0.3 +- Ruby 2.3.1p112 +- Swift 5.3 +- Julia 1.5.1 + +### Package Management +- Homebrew 2.5.1 +- Gem 3.1.4 +- Miniconda 4.8.3 +- Helm +- Npm 6.14.8 +- Yarn +- Pip 8.1.1 +- Pip3 8.1.1 +- Vcpkg 2020.06.15 + +### Project Management +- Ant 1.9.6 - Gradle 6.6.1 -- Maven (Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f)) -- Kind (kind v0.8.1 go1.14.2 linux/amd64) -- kubectl (Client Version: v1.19.1) -- helm (v3.3.1+g249e521) -- minikube version: v1.13.0 -- kustomize ({kustomize/v3.8.2 2020-08-29T17:44:01Z }) -- oc CLI Client Version: 4.5.0-202005291417-9933eb9 -- Leiningen (Leiningen 2.9.4 on Java 1.8.0_265 OpenJDK 64-Bit Server VM) -- Mercurial (Mercurial Distributed SCM (version 4.4.1)) -- Miniconda (conda 4.8.3) -- Mono (Mono JIT compiler version 6.12.0.90 (tarball Fri Sep 4 13:58:50 UTC 2020)) -- NuGet (NuGet Version: 5.5.0.6382) -- MySQL (mysql Ver 14.14 Distrib 5.7.31, for Linux (x86_64) using EditLine wrapper) +- Maven 3.6.3 +- Sbt 1.3.13 + +### Tools +- 7-Zip 9.20 +- Ansible 2.9.13 +- AzCopy10 10.6.0 (available by `azcopy10` alias) +- AzCopy7 7.3.0 (available by `azcopy` alias) +- Bazel 3.5.0 +- Bazelisk 1.6.1 +- CMake 3.17.0 +- curl 7.47.0 +- Docker Compose 1.27.3 +- Docker-Buildx 0.4.2 +- Docker-Moby 19.03.12 +- Git 2.28.0 +- Git LFS 2.12.0 +- Git-ftp 1.0.2 +- Google Cloud SDK 310.0.0 +- Haveged 1.9.1 +- Heroku 7.43.0 +- HHVM (HipHop VM) 4.56.1 +- jq 1.5 +- Kind 0.9.0 +- Kubectl 1.19.2 +- Kustomize 3.8.4 +- Leiningen 2.9.4 +- m4 1.4.17 +- Mercurial 4.4.1 +- Minikube 1.13.0 +- Newman 5.2.0 +- nvm 0.35.3 +- Packer 1.6.2 +- PhantomJS 2.1.1 +- SVN 1.9.3 +- Swig 3.0.8 +- Terraform 0.13.3 +- unzip 6.00 +- wget 1.17.1 +- zip 3.0 +- zstd 1.3.1 + +### CLI Tools +- Alibaba Cloud CLI 3.0.59 +- AWS CLI 1.18.142 +- AWS CLI Session manager plugin 1.1.61.0 +- AWS SAM CLI 1.2.0 +- Azure CLI (azure-cli) 2.11.1 +- Azure CLI (azure-devops) 0.18.0 +- GitHub CLI +- Hub CLI 2.14.2 +- Netlify CLI 2.63.2 +- oc CLI 4.5.0 +- ORAS CLI 0.8.1 +- Vercel CLI 20.1.0 + +### Java +| Version | Vendor | Environment Variable | +| ------------------- | ------------ | -------------------- | +| 1.7.0_272 | Zulu | JAVA_HOME_7_X64 | +| 1.8.0_265 (default) | AdoptOpenJDK | JAVA_HOME_8_X64 | +| 11.0.8 | AdoptOpenJDK | JAVA_HOME_11_X64 | +| 12.0.2 | AdoptOpenJDK | JAVA_HOME_12_X64 | + +### PHP +| Tool | Version | +| -------- | ----------------------------------------- | +| PHP | 5.6.40 7.0.33 7.1.33 7.2.33 7.3.22 7.4.10 | +| Composer | 1.10.13 | +| PHPUnit | 7.5.20 | + +### Haskell +- GHC 8.10.2 +- Cabal 3.4.0.0 +- Stack 2.3.3 + +### Rust Tools +- Rust 1.46.0 +- Rustup 1.22.1 +- Rustdoc 1.46.0 +- Cargo 1.46.0 + +#### Packages +- Bindgen 0.55.1 +- Cargo audit 0.12.0 +- Cargo outdated 0.9.11 +- Cargo clippy 0.0.212 +- Cbindgen 0.14.5 +- Rustfmt 1.4.18 + +### Browsers and Drivers +- Google Chrome 85.0.4183.102 +- ChromeDriver 85.0.4183.87 +- Mozilla Firefox 80.0.1 +- Geckodriver 0.27.0 + +### .NET Core SDK +- 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 2.1.508 2.1.509 2.1.510 2.1.511 2.1.512 2.1.513 2.1.514 2.1.515 2.1.516 2.1.517 2.1.518 2.1.602 2.1.603 2.1.604 2.1.605 2.1.606 2.1.607 2.1.608 2.1.609 2.1.610 2.1.611 2.1.612 2.1.613 2.1.614 2.1.615 2.1.700 2.1.701 2.1.801 2.1.802 2.1.803 2.1.804 2.1.805 2.1.806 2.1.807 2.1.808 2.1.809 2.1.810 3.0.100 3.0.101 3.0.102 3.0.103 3.1.100 3.1.101 3.1.102 3.1.103 3.1.104 3.1.105 3.1.106 3.1.107 3.1.108 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 + +### Az Module +- 1.0.0 1.6.0 2.3.2 2.6.0 2.8.0 3.1.0 3.5.0 3.8.0 4.3.0 4.4.0 4.6.0 + +### Databases +- Postgre SQL 12.4 +- MongoDB 4.4.1 +- sqlite3 3.11.0 + +#### MySQL +- MySQL 5.7.31 - MySQL Server (user:root password:root) - MS SQL Server Client Tools -- MySQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service' -- Node.js (v12.18.3) -- Grunt (grunt-cli v1.3.2) -- Gulp (CLI version: 2.3.0 -Local version: Unknown) -- n (6.7.0) -- Parcel (1.12.4) -- TypeScript (Version 4.0.2) -- Webpack (4.44.1) -- Webpack CLI (3.3.12) -- Yarn (1.22.5) -- Newman (5.2.0) -- Bazel (bazel 3.5.0) -- Bazelisk (1.6.1) -- ORAS CLI 0.8.1 -- PhantomJS (2.1.1) -- PHP 5.6 (PHP 5.6.40-30+ubuntu16.04.1+deb.sury.org+1 (cli) ) -- PHP 7.0 (PHP 7.0.33-30+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Aug 7 2020 14:46:59) ( NTS )) -- PHP 7.1 (PHP 7.1.33-17+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Aug 7 2020 14:46:52) ( NTS )) -- PHP 7.2 (PHP 7.2.33-1+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Aug 7 2020 14:43:59) ( NTS )) -- PHP 7.3 (PHP 7.3.22-1+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Sep 9 2020 06:46:12) ( NTS )) -- PHP 7.4 (PHP 7.4.10 (cli) (built: Sep 9 2020 06:35:57) ( NTS )) -- Composer (Composer version 1.10.13 2020-09-09 11:46:34) -- PHPUnit (PHPUnit 7.5.20 by Sebastian Bergmann and contributors.) -- Pollinate -- psql (PostgreSQL) 12.4 -- Powershell (PowerShell 7.0.3) -- Pulumi v2.10.0 -- ruby (2.3.1p112) -- gem (3.1.4) -- OpenSSL 1.1.0h 27 Mar 2018 (Library: OpenSSL 1.1.1g 21 Apr 2020) -- Libssl 1.1.1g-1+ubuntu16.04.1+deb.sury.org+1 -- R 4.0.2 -- rustup (1.22.1) -- rust (1.46.0) -- cargo (1.46.0) -- rustfmt (1.4.18-stable) -- clippy (0.0.212) -- rustdoc (1.46.0) -- bindgen (0.55.1) -- cbindgen (0.14.4) -- cargo audit (0.12.0) -- cargo outdated (v0.9.11) -- Julia (julia version 1.5.1) -- sbt (1.3.13) -- Selenium server standalone (available via SELENIUM_JAR_PATH environment variable) -- Sphinx Open Source Search Server -- Subversion (svn, version 1.9.3 (r1718519)) -- Terraform (Terraform v0.13.2) -- Packer (1.6.2) -- Vcpkg 2020.06.15-unknownhash -- Vercel CLI (20.1.0) -- MongoDB on Linux v4.4.1 -- Haveged 1.9.1-3 -- Swig 3.0.8 -- Netlify CLI (netlify-cli/2.63.0 linux-x64 node-v12.18.3) -- Google Repository 58 -- Google Play services 49 -- Google APIs 24 -- Google APIs 23 -- Google APIs 22 -- Google APIs 21 -- CMake 3.10.2.4988404 -3.6.4111459 -- Android ConstraintLayout 1.0.2 -- Android ConstraintLayout 1.0.1 -- Android ConstraintLayout Solver 1.0.2 -- Android ConstraintLayout Solver 1.0.1 -- Android SDK Platform-Tools 30.0.4 -- Android SDK Platform 30 -- Android SDK Platform 29 -- Android SDK Platform 28 -- Android SDK Platform 27 -- Android SDK Platform 26 -- Android SDK Platform 25 -- Android SDK Platform 24 -- Android SDK Platform 23 -- Android SDK Platform 22 -- Android SDK Platform 21 -- Android SDK Platform 19 -- Android SDK Platform 17 -- Android SDK Platform 15 -- Android SDK Platform 10 -- Android SDK Patch Applier v4 -- Android SDK Build-Tools 30.0.2 -- Android SDK Build-Tools 30.0.1 -- Android SDK Build-Tools 30.0.0 -- Android SDK Build-Tools 29.0.3 -- Android SDK Build-Tools 29.0.2 -- Android SDK Build-Tools 29.0.0 -- Android SDK Build-Tools 28.0.3 -- Android SDK Build-Tools 28.0.2 -- Android SDK Build-Tools 28.0.1 -- Android SDK Build-Tools 28.0.0 -- Android SDK Build-Tools 27.0.3 -- Android SDK Build-Tools 27.0.2 -- Android SDK Build-Tools 27.0.1 -- Android SDK Build-Tools 27.0.0 -- Android SDK Build-Tools 26.0.3 -- Android SDK Build-Tools 26.0.2 -- Android SDK Build-Tools 26.0.1 -- Android SDK Build-Tools 26.0.0 -- Android SDK Build-Tools 25.0.3 -- Android SDK Build-Tools 25.0.2 -- Android SDK Build-Tools 25.0.1 -- Android SDK Build-Tools 25.0.0 -- Android SDK Build-Tools 24.0.3 -- Android SDK Build-Tools 24.0.2 -- Android SDK Build-Tools 24.0.1 -- Android SDK Build-Tools 24.0.0 -- Android SDK Build-Tools 23.0.3 -- Android SDK Build-Tools 23.0.2 -- Android SDK Build-Tools 23.0.1 -- Android SDK Build-Tools 22.0.1 -- Android SDK Build-Tools 21.1.2 -- Android SDK Build-Tools 20.0.0 -- Android SDK Build-Tools 19.1.0 -- Android SDK Build-Tools 17.0.0 -- Android NDK 21.3.6528147 -- Az Module (1.0.0) -- Az Module (1.6.0) -- Az Module (2.3.2) -- Az Module (2.6.0) -- Az Module (2.8.0) -- Az Module (3.1.0) -- Az Module (3.5.0) -- Az Module (3.8.0) -- Az Module (4.3.0) -- Az Module (4.4.0) -- Az Module (4.6.0) -- Ruby: - - Ruby 2.4.10 - - Ruby 2.5.8 - - Ruby 2.6.6 - - Ruby 2.7.1 -- Python (Python 2.7.12) -- pip (pip 8.1.1 from /usr/lib/python2.7/dist-packages (python 2.7)) -- Python3 (Python 3.5.2) -- pip3 (pip 8.1.1 from /usr/lib/python3/dist-packages (python 3.5)) -- Python: - - Python 2.7.18 - - Python 3.5.10 - - Python 3.6.12 - - Python 3.7.9 - - Python 3.8.5 -- PyPy: - - PyPy 2.7.13 [PyPy 7.3.1 with GCC 7.3.1 20180303 (Red Hat 7.3.1-5)] - - PyPy 3.6.9 [PyPy 7.3.1 with GCC 7.3.1 20180303 (Red Hat 7.3.1-5)] -- node: - - node 8.17.0 - - node 10.22.0 - - node 12.18.3 - - node 14.10.1 -- go: - - go 1.11.13 - - go 1.12.17 - - go 1.13.15 - - go 1.14.9 - - go 1.15.2 -- boost: - - boost 1.69.0 - - boost 1.72.0 -- AWS SAM CLI, version 1.2.0 -- Homebrew on Linux (Homebrew 2.5.1 -Homebrew/linuxbrew-core (git revision d52011; last commit 2020-09-12)) + +``` + MySQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service' +``` +### Cached Tools +#### Ruby +- 2.4.10 +- 2.5.8 +- 2.6.6 +- 2.7.1 + +#### Python +- 2.7.18 +- 3.5.10 +- 3.6.12 +- 3.7.9 +- 3.8.5 + +#### PyPy +- 2.7.13 [PyPy 7.3.1] +- 3.6.9 [PyPy 7.3.1] + +#### Node.js +- 8.17.0 +- 10.22.1 +- 12.18.4 +- 14.11.0 + +#### Go +- 1.11.13 +- 1.12.17 +- 1.13.15 +- 1.14.9 +- 1.15.2 + +#### Boost +- 1.69.0 +- 1.72.0 + +### Android +| Package Name | Version | +| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android SDK Platform-Tools | 30.0.4 | +| Android SDK Tools | 26.1.1 | +| Android SDK Platforms | android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-19 (rev 4)
android-17 (rev 3)
android-15 (rev 5)
android-10 (rev 2) | +| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2
29.0.0 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0
17.0.0 | +| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | +| NDK | 21.3.6528147 | +| Android Support Repository | 47.0.0 | +| Google Play services | 49 | +| Google Repository | 58 | +| SDK Patch Applier v4 | 1 | +| CMake | 3.10.2
3.6.4111459 | + +### Cached Docker images +- alpine:3.7 +- alpine:3.8 +- alpine:3.9 +- alpine:3.10 +- buildpack-deps:stretch +- buildpack-deps:buster +- debian:8 +- debian:9 +- jekyll/builder +- mcr.microsoft.com/azure-pipelines/node8-typescript +- node:10 +- node:12 +- node:10-alpine +- node:12-alpine +- ubuntu:14.04 + +### Installed apt packages +- bison, brotli, bzip2, curl, dbus, dnsutils, dpkg, fakeroot, file, flex, ftp, gnupg2, iproute2, iputils-ping, jq, lib32z1, libc++-dev, libc++abi-dev, libcurl3, libgbm-dev, libgconf-2-4, libgtk-3-0, libicu55, libsecret-1-dev, libsqlite3-dev, libunwind8, libxkbfile-dev, libxss1, locales, m4, netcat, openssh-client, parallel, patchelf, pkg-config, rpm, rsync, shellcheck, sqlite3, ssh, sudo, telnet, texinfo, time, tk, tzdata, unzip, upx, wget, xorriso, xvfb, xz-utils, yamllint, zip, zstd, zsync + + From 8f597be18bf04e963e13364d8c07521d096a4a4a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Sep 2020 09:19:45 +0000 Subject: [PATCH 35/55] Updating readme file for win19 version 20200920.1 (#1627) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 114 ++++++++++++++++--------------- 1 file changed, 59 insertions(+), 55 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index c74d15f3b..50f161d2b 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,10 +1,10 @@ | Announcements | |-| -| [Replace SVN (1.8.17) by TortoiseSVN (1.14.x) on Windows images](https://github.com/actions/virtual-environments/issues/1318) | +| [[In Discussion] Git internal tools will be removed from PATH Windows images](https://github.com/actions/virtual-environments/issues/1525) | *** # Microsoft Windows Server 2019 Datacenter -- OS Version: 10.0.17763 Build 1397 -- Image Version: 20200827.1 +- OS Version: 10.0.17763 Build 1457 +- Image Version: 20200920.1 ## Enabled windows optional features - Windows Subsystem for Linux @@ -17,26 +17,26 @@ - Java 13.0.2 - Python 3.7.9 - Ruby 2.5.8p224 -- Go 1.14.7 +- Go 1.14.9 - PHP 7.4.9 - Julia 1.5.1 -- Perl 5.30.3 -- Node 12.18.3 +- Perl 5.32.0 +- Node 12.18.4 ### Package Management - Chocolatey 0.10.15 - Vcpkg 2020.06.15 - NPM 6.14.6 -- Yarn 1.22.4 -- pip 20.2.2 (python 3.7) +- Yarn 1.22.5 +- pip 20.2.3 (python 3.7) - Miniconda 4.6.14 - RubyGems 3.1.4 -- Helm 3.3.0 -- Composer 1.10.10 +- Helm 3.3.3 +- Composer 1.10.13 - NuGet 5.7.0.6726 ### Project Management -- Ant 1.10.5 +- Ant 1.10.8 - Maven 3.6.3 - Gradle 6.6 - sbt 1.3.13 @@ -44,26 +44,27 @@ ### Tools - Azure CosmosDb Emulator 2.11.5.0 - azcopy 10.6.0 -- Bazel 3.4.1 +- Bazel 3.5.0 - Bazelisk 1.6.1 - CMake 3.18.2 - R 4.0.2 -- Docker 19.03.11 -- Docker-compose 1.26.2 +- Docker 19.03.12 +- Docker-compose 1.27.2 - Git 2.28.0 - Git LFS 2.11.0 -- Google Cloud SDK 307.0.0 +- Google Cloud SDK 310.0.0 - InnoSetup 6.0.5 - jq 1.6 -- Kubectl 1.18.8 -- Kind 0.8.1 +- Kubectl 1.19.1 +- Kind 0.9.0 - Mingw-w64 8.1.0 - MySQL 5.7.21.0 - Mercurial 5.0 - NSIS v3.06.1 -- Newman 5.1.2 +- Newman 5.2.0 - OpenSSL 1.1.1 -- Packer 1.6.1 +- Packer 1.6.2 +- Pulumi v2.10.1 - SQLPS 1.0 - SQLServer PS 21.1.18226 - Subversion (SVN) 1.14.0 @@ -71,37 +72,37 @@ - Cabal 3.2.0.0 - Stack 2.3.3 - WinAppDriver 1.1.1809.18001 -- zstd 1.4.0 +- zstd 1.4.5 - VSWhere 2.8.4 - 7zip 19.00 - yamllint 1.24.2 ### CLI Tools -- Azure CLI 2.11.0 +- Azure CLI 2.11.1 - Azure DevOps CLI extension 0.18.0 -- AWS CLI 2.0.43 -- AWS SAM CLI 1.1.0 +- AWS CLI 2.0.50 +- AWS SAM CLI 1.2.0 - AWS Session Manager CLI 1.1.61.0 -- Alibaba Cloud CLI 3.0.56 +- Alibaba Cloud CLI 3.0.59 - Cloud Foundry CLI 6.52.0 - Hub CLI 2.14.2 -- GitHub CLI gh version 0.11.1 (2020-07-28) https://github.com/cli/cli/releases/tag/v0.11.1 +- GitHub CLI 1.0.0 ### Rust Tools -- Rust 1.45.2 +- Rust 1.46.0 #### Packages - bindgen 0.55.1 -- cbindgen 0.14.4 +- cbindgen 0.14.5 - cargo-audit 0.12.0 - cargo-outdated v0.9.11 ### Browsers and webdrivers -- Google Chrome 85.0.4183.83 -- Chrome Driver 85.0.4183.83 -- Microsoft Edge 84.0.522.63 -- Microsoft Edge Driver 84.0.522.63 -- Mozilla Firefox 80.0 +- Google Chrome 85.0.4183.102 +- Chrome Driver 85.0.4183.87 +- Microsoft Edge 85.0.564.51 +- Microsoft Edge Driver 85.0.564.51 +- Mozilla Firefox 80.0.1 - Gecko Driver 0.27.0 - IE Driver 3.150.1.0 @@ -141,17 +142,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 1.11.13 | x64 | GOROOT_1_11_X64 | | 1.12.17 | x64 | GOROOT_1_12_X64 | | 1.13.15 | x64 | GOROOT_1_13_X64 | -| 1.14.7 (Default) | x64 | GOROOT_1_14_X64 | -| 1.15.0 | x64 | GOROOT_1_15_X64 | +| 1.14.9 (Default) | x64 | GOROOT_1_14_X64 | +| 1.15.2 | x64 | GOROOT_1_15_X64 | #### Node | Version | Architecture | | ------- | ------------ | | 8.17.0 | x64 | -| 10.22.0 | x64 | -| 12.18.3 | x64 | -| 14.8.0 | x64 | +| 10.22.1 | x64 | +| 12.18.4 | x64 | +| 14.11.0 | x64 | #### Python @@ -198,20 +199,20 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 4.4.0.0 | MongoDB | Running | Automatic | +| 4.4.1.0 | MongoDB | Running | Automatic | ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.7.30413.136 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.7.30503.244 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | -------------- | -| Component.Android.NDK.R16B | 16.7.30411.121 | +| Component.Android.NDK.R16B | 16.7.30427.251 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK28 | 16.2.29003.222 | | Component.Ant | 1.9.3.8 | @@ -230,12 +231,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.UnityEngine.x64 | 16.7.30310.162 | | Component.Unreal | 16.1.28810.153 | | Component.Unreal.Android | 16.1.28810.153 | +| Component.VSInstallerProjects | 0.9.9 | | Component.WixToolset.VisualStudioExtension.Dev16 | 1.0.0.4 | | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.4 | | Component.WixToolset.VisualStudioExtension.Schemas4 | 1.0.0.4 | | Component.Xamarin | 16.7.30310.162 | | Component.Xamarin.RemotedSimulator | 16.0.28315.86 | | Microsoft.Component.Azure.DataLake.Tools | 16.7.30310.162 | +| Microsoft.Component.ClickOnce | 16.4.29409.204 | | Microsoft.Component.MSBuild | 16.5.29515.121 | | Microsoft.Component.NetFX.Native | 16.5.29515.121 | | Microsoft.Component.PythonTools | 16.5.29515.121 | @@ -261,10 +264,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.7.DeveloperTools | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 16.0.28516.191 | -| Microsoft.Net.Core.Component.SDK.2.1 | 16.7.30406.193 | +| Microsoft.Net.Core.Component.SDK.2.1 | 16.7.30428.286 | | Microsoft.NetCore.Component.DevelopmentTools | 16.5.29721.120 | -| Microsoft.NetCore.Component.Runtime.3.1 | 16.7.30406.193 | -| Microsoft.NetCore.Component.SDK | 16.7.30406.193 | +| Microsoft.NetCore.Component.Runtime.3.1 | 16.7.30428.286 | +| Microsoft.NetCore.Component.SDK | 16.7.30428.286 | | Microsoft.NetCore.Component.Web | 16.5.29721.120 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 16.5.29515.121 | | Microsoft.VisualStudio.Component.AspNet45 | 16.0.28315.86 | @@ -397,6 +400,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 16.7.30310.162 | | Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 16.3.29102.218 | | Microsoft.VisualStudio.ComponentGroup.UWP.Support | 16.4.29409.204 | +| Microsoft.VisualStudio.ComponentGroup.UWP.VC | 16.7.30310.162 | | Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 16.5.29514.35 | | Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 16.4.29318.151 | | Microsoft.VisualStudio.ComponentGroup.Web | 16.4.29318.151 | @@ -422,7 +426,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Python | 16.0.28621.142 | | Microsoft.VisualStudio.Workload.Universal | 16.7.30310.162 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 16.4.29409.204 | -| SSDT Microsoft Analysis Services Projects | 2.9.12 | +| SSDT Microsoft Analysis Services Projects | 2.9.13 | | SSDT SQL Server Integration Services Projects | 3.9 | | SSDT Microsoft Reporting Services Projects | 2.6.7 | | Windows Driver Kit | 3.11.4516 | @@ -451,20 +455,20 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 2.1.508 2.1.509 2.1.510 2.1.511 2.1.512 2.1.513 2.1.514 2.1.515 2.1.516 2.1.517 2.1.602 2.1.603 2.1.604 2.1.605 2.1.606 2.1.607 2.1.608 2.1.609 2.1.610 2.1.611 2.1.612 2.1.613 2.1.614 2.1.700 2.1.701 2.1.801 2.1.802 2.1.803 2.1.804 2.1.805 2.1.806 2.1.807 2.1.808 2.1.809 3.1.100 3.1.101 3.1.102 3.1.103 3.1.104 3.1.105 3.1.106 3.1.107 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 +- 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 2.1.508 2.1.509 2.1.510 2.1.511 2.1.512 2.1.513 2.1.514 2.1.515 2.1.516 2.1.517 2.1.518 2.1.602 2.1.603 2.1.604 2.1.605 2.1.606 2.1.607 2.1.608 2.1.609 2.1.610 2.1.611 2.1.612 2.1.613 2.1.614 2.1.615 2.1.700 2.1.701 2.1.801 2.1.802 2.1.803 2.1.804 2.1.805 2.1.806 2.1.807 2.1.808 2.1.809 2.1.810 3.1.100 3.1.101 3.1.102 3.1.103 3.1.104 3.1.105 3.1.106 3.1.107 3.1.108 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 +- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 ### .NET Framework `Type: Developer Pack` @@ -475,11 +479,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - PowerShell 7.0.3 #### Azure Powershell Modules -| Module | Version | Path | -| ------- | ----------------------------------------------------------------------------- | ------------------------------ | -| Az | 1.0.0
1.6.0
2.3.2
2.6.0
3.1.0
3.5.0
3.8.0
4.3.0
4.4.0 | C:\Modules\az_\ | -| Azure | 2.1.0 [Installed]
3.8.0
4.2.1
5.1.1
5.3.0 | C:\Modules\azure_\ | -| AzureRM | 2.1.0 [Installed]
3.8.0
4.2.1
5.1.1
6.7.0
6.13.1 | C:\Modules\azurerm_\ | +| Module | Version | Path | +| ------- | -------------------------------------------------------------------------------------- | ------------------------------ | +| Az | 1.0.0
1.6.0
2.3.2
2.6.0
3.1.0
3.5.0
3.8.0
4.3.0
4.4.0
4.6.0 | C:\Modules\az_\ | +| Azure | 2.1.0 [Installed]
3.8.0
4.2.1
5.1.1
5.3.0 | C:\Modules\azure_\ | +| AzureRM | 2.1.0 [Installed]
3.8.0
4.2.1
5.1.1
6.7.0
6.13.1 | C:\Modules\azurerm_\ | ``` Azure PowerShell module 2.1.0 and AzureRM PowerShell module 2.1.0 are installed and are available via 'Get-Module -ListAvailable'. @@ -490,7 +494,7 @@ All other versions are saved but not installed. | ------------------ | ------------------ | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Pester | 3.4.0
5.0.3 | +| Pester | 3.4.0
5.0.4 | | PowerShellGet | 1.0.0.1
2.2.4.1 | | PSWindowsUpdate | 2.2.0.2 | | SqlServer | 21.1.18226 | From 207f49ed9343b65a01c0750a2e552d05a3bd985b Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Thu, 24 Sep 2020 13:01:25 +0300 Subject: [PATCH 36/55] add g++-10 --- .../linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 6 +++--- images/linux/scripts/installers/gcc.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 64a9d1c3f..267dcac3a 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -8,7 +8,7 @@ function Get-CPPVersions { $cppVersions = apt list --installed 2>&1 | Where-Object { $_ -match "g\+\+-\d+"} | ForEach-Object { $_ -match "now (?\d+\.\d+\.\d+)-" | Out-Null $Matches.version - } + } | Sort-Object {[Version]$_} return "GNU C++ " + ($cppVersions -Join ", ") } @@ -16,7 +16,7 @@ function Get-FortranVersions { $fortranVersions = apt list --installed 2>&1 | Where-Object { $_ -match "^gfortran-\d+"} | ForEach-Object { $_ -match "now (?\d+\.\d+\.\d+)-" | Out-Null $Matches.version - } + } | Sort-Object {[Version]$_} return "GNU Fortran " + ($fortranVersions -Join ", ") } @@ -28,7 +28,7 @@ function Get-ClangVersions { $_ -match "clang version (?\d+\.\d+\.\d+)-" | Out-Null $Matches.version } - } + } | Sort-Object {[Version]$_} return "Clang " + ($clangVersions -Join ", ") } diff --git a/images/linux/scripts/installers/gcc.sh b/images/linux/scripts/installers/gcc.sh index 7b1bd56ea..914c3e1e0 100644 --- a/images/linux/scripts/installers/gcc.sh +++ b/images/linux/scripts/installers/gcc.sh @@ -4,7 +4,6 @@ ## Desc: Installs GNU C++ ################################################################################ - function InstallGcc { version=$1 @@ -27,6 +26,7 @@ versions=( "g++-7" "g++-8" "g++-9" + "g++-10" ) for version in ${versions[*]} From 956f9257505d3d10e63220e93da37dfd37a55778 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Sep 2020 11:18:37 +0000 Subject: [PATCH 37/55] Updating readme file for win16 version 20200920.1 (#1626) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 34 ++++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index c7bffc4fc..ed74bc3a5 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -4,7 +4,7 @@ *** # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 3930 -- Image Version: 20200913.0 +- Image Version: 20200920.1 ## Installed Software ### Language and Runtime @@ -18,7 +18,7 @@ - PHP 7.4.9 - Julia 1.5.1 - Perl 5.32.0 -- Node 12.18.3 +- Node 12.18.4 ### Package Management - Chocolatey 0.10.15 @@ -28,7 +28,7 @@ - pip 20.2.3 (python 3.7) - Miniconda 4.6.14 - RubyGems 3.1.4 -- Helm 3.3.1 +- Helm 3.3.3 - Composer 1.10.13 - NuGet 5.7.0.6726 @@ -45,15 +45,15 @@ - Bazelisk 1.6.1 - CMake 3.18.2 - R 4.0.2 -- Docker 19.03.11 -- Docker-compose 1.26.2 +- Docker 19.03.12 +- Docker-compose 1.27.2 - Git 2.28.0 - Git LFS 2.11.0 -- Google Cloud SDK 309.0.0 +- Google Cloud SDK 310.0.0 - InnoSetup 6.0.5 - jq 1.6 - Kubectl 1.19.1 -- Kind 0.8.1 +- Kind 0.9.0 - Mingw-w64 8.1.0 - MySQL 5.7.21.0 - Mercurial 5.0 @@ -61,7 +61,7 @@ - Newman 5.2.0 - OpenSSL 1.1.1 - Packer 1.6.2 -- Pulumi v2.10.0 +- Pulumi v2.10.1 - SQLPS 1.0 - SQLServer PS 21.1.18226 - Subversion (SVN) 1.14.0 @@ -77,20 +77,20 @@ ### CLI Tools - Azure CLI 2.11.1 - Azure DevOps CLI extension 0.18.0 -- AWS CLI 2.0.48 +- AWS CLI 2.0.50 - AWS SAM CLI 1.2.0 - AWS Session Manager CLI 1.1.61.0 -- Alibaba Cloud CLI 3.0.56 +- Alibaba Cloud CLI 3.0.59 - Cloud Foundry CLI 6.52.0 - Hub CLI 2.14.2 -- GitHub CLI 0.12.0 +- GitHub CLI 1.0.0 ### Rust Tools - Rust 1.46.0 #### Packages - bindgen 0.55.1 -- cbindgen 0.14.4 +- cbindgen 0.14.5 - cargo-audit 0.12.0 - cargo-outdated v0.9.11 @@ -147,9 +147,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | | ------- | ------------ | | 8.17.0 | x64 | -| 10.22.0 | x64 | -| 12.18.3 | x64 | -| 14.10.1 | x64 | +| 10.22.1 | x64 | +| 12.18.4 | x64 | +| 14.11.0 | x64 | #### Python @@ -174,8 +174,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### PyPy | Python Version | Architecture | PyPy Version | | -------------- | ------------ | ------------ | -| 2.7.13 | x86 | PyPy 7.3.2 with MSC v.1927 32 bit | -| 3.6.9 | x86 | PyPy 7.3.2 with MSC v.1927 32 bit | +| 2.7.13 | x86 | PyPy 7.3.1 with MSC v.1912 32 bit | +| 3.6.9 | x86 | PyPy 7.3.1 with MSC v.1912 32 bit | From 083046a33cd6c680382c237c02ce81c934836154 Mon Sep 17 00:00:00 2001 From: Darii Nurgaleev Date: Thu, 24 Sep 2020 19:05:39 +0700 Subject: [PATCH 38/55] added toolsets --- images/macos/toolsets/toolset-10.15.json | 4 ++-- images/macos/toolsets/toolset-11.0.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index e7b17989f..26c0cf19c 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -6,12 +6,12 @@ ] }, "xamarin": { - "vsmac": "8.7.7.10", + "vsmac": "8.7.8.4", "mono-versions": [ "6.12.0.93", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" ], "ios-versions": [ - "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" + "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" ], "mac-versions": [ "6.20.2.2", "6.18.3.2", "6.16.0.13", "6.14.1.39", "6.10.0.21", "6.8.3.0", "6.6.0.12", "6.4.0.2", "6.2.0.47" diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json index fa7a65a5a..3f139910d 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.0.json @@ -6,12 +6,12 @@ ] }, "xamarin": { - "vsmac": "8.7.7.10", + "vsmac": "8.7.8.4", "mono-versions": [ "6.12.0.93" ], "ios-versions": [ - "13.20.2.2" + "14.0.0.0", "13.20.2.2" ], "mac-versions": [ "6.20.2.2" From ffbcaa7854620e2d260de98869b05862550de5c2 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov Date: Thu, 24 Sep 2020 15:07:30 +0300 Subject: [PATCH 39/55] add missing tools to ubuntu docs --- .../SoftwareReport/SoftwareReport.Generator.ps1 | 4 ++++ .../scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 73a8d63e7..5c93cdd5b 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -101,7 +101,11 @@ $toolsList = @( (Get-NewmanVersion), (Get-NvmVersion), (Get-PackerVersion), + ("Pollinate"), (Get-PhantomJSVersion), + (Get-PulumiVersion), + (Get-RVersion), + ("Sphinx Open Source Search Server"), (Get-SwigVersion), (Get-TerraformVersion), (Get-UnZipVersion), diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index dcb121f61..43828d48a 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -247,3 +247,13 @@ function Get-ORASCliVersion { function Get-VerselCliversion { return "$(vercel --version 2>&1 | Select-Object -First 1)" } + +function Get-PulumiVersion { + $pulumiVersion = pulumi version | Take-OutputPart -Part 0 -Delimiter "v" + return "Pulumi $pulumiVersion" +} + +function Get-RVersion { + $rVersion = R --version | Select-String "R version" | Take-OutputPart -Part -2 + return "R $rVersion" +} From 3500bbdf3e471b887d4e4b99aecefd79d9d61d80 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov Date: Thu, 24 Sep 2020 16:50:28 +0300 Subject: [PATCH 40/55] add sphinx version and remove pollinate --- .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 3 +-- .../linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 5c93cdd5b..f4dce82c7 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -101,11 +101,10 @@ $toolsList = @( (Get-NewmanVersion), (Get-NvmVersion), (Get-PackerVersion), - ("Pollinate"), (Get-PhantomJSVersion), (Get-PulumiVersion), (Get-RVersion), - ("Sphinx Open Source Search Server"), + (Get-SphinxVersion), (Get-SwigVersion), (Get-TerraformVersion), (Get-UnZipVersion), diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 43828d48a..35b5ec4de 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -257,3 +257,8 @@ function Get-RVersion { $rVersion = R --version | Select-String "R version" | Take-OutputPart -Part -2 return "R $rVersion" } + +function Get-SphinxVersion { + $sphinxVersion = searchd | Take-OutputPart -Part 1 | Take-OutputPart -Part 0 -Delimiter "-" + return "Sphinx Open Source Search Server $rVersion" +} \ No newline at end of file From 184354ad8e12f550801977d5497e0e5881fc0caa Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Sep 2020 15:00:57 +0000 Subject: [PATCH 41/55] Updating readme file for ubuntu18 version 20200920.1 (#1629) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 588 +++++++++++------------------- 1 file changed, 218 insertions(+), 370 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index afcf59dc6..f72a52ca0 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,378 +1,226 @@ - | Announcements | |-| +| [Default Python will be switched to 3.8 on Ubuntu 20.04 on October, 6](https://github.com/actions/virtual-environments/issues/1591) | | [Clang/LLVM 10 will be set as a default one and Clang/LLVM 6 will be deprecated for Ubuntu 20.04 on September, 23](https://github.com/actions/virtual-environments/issues/1536) | *** # Ubuntu 18.04.5 LTS -The following software is installed on machines with the 20200914.1 update. -*** -- 7-Zip 16.02 -- Ansible (ansible 2.9.13) -- AzCopy7 (available by azcopy alias) 7.3.0 -- AzCopy10 (available by azcopy10 alias) 10.6.0 -- Azure CLI (azure-cli 2.11.1) -- Azure CLI (azure-devops 0.18.0) -- Basic packages: - - dbus - - dnsutils - - dpkg - - fakeroot - - gnupg2 - - iproute2 - - iputils-ping - - lib32z1 - - libc++abi-dev - - libc++-dev - - libcurl3 - - libgbm-dev - - libgconf-2-4 - - libgtk-3-0 - - libsecret-1-dev - - libsqlite3-dev - - libunwind8 - - libxkbfile-dev - - libxss1 - - locales - - openssh-client - - pkg-config - - rpm - - texinfo - - tk - - tzdata - - upx - - xorriso - - xvfb - - xz-utils - - zstd - - zsync - - bison - - brotli - - bzip2 - - curl - - file - - flex - - ftp - - jq - - m4 - - netcat - - parallel - - patchelf - - rsync - - shellcheck - - sqlite3 - - ssh - - sudo - - telnet - - time - - unzip - - wget - - yamllint - - zip -- Alibaba Cloud CLI (3.0.56) -- AWS CLI (aws-cli/1.18.137 Python/2.7.17 Linux/5.4.0-1025-azure botocore/1.17.60) -- AWS CLI Session manager plugin (1.1.61.0) -- build-essential -- Clang 6.0 (6.0.0) -- Clang 8 (8.0.0) -- Clang 9 (9.0.0) -- Swift version 5.2.5 (swift-5.2.5-RELEASE) -Target: x86_64-unknown-linux-gnu -- CMake (cmake version 3.17.0) -- Podman (2.0.6) -- Buildah (1.15.2) -- Skopeo (1.1.1) -- Docker Compose (docker-compose version 1.27.2, build 18f557f9) -- Docker-Moby (Docker version 19.03.12+azure, build 0ed913b885c8919944a2e4c8d0b80a318a8dd48b) -- Docker-Buildx (0.4.2+azure) -- Cached container images - - node:10 (Digest: sha256:ab6f988c514b5c5fb6d5a6d18afb216084b256719791c6cc61096da58e66c436) - - node:12 (Digest: sha256:20ffb04c1d35e273dc7aa68fe31ef136630d95128689283a8eb914329158022b) - - buildpack-deps:stretch (Digest: sha256:4f72cea5afa05e21bf2aec93b219b0843a10af5e2f407cc184f211e45f929ccc) - - buildpack-deps:buster (Digest: sha256:8a76b9f9ee417eb330e97d3129e373277515e98d0f3a95a89ab944b645190efd) - - debian:9 (Digest: sha256:bc125c699d736ac84c92b76ab7028741bbac69f207b7a8a4065bca6f79d5698e) - - debian:8 (Digest: sha256:e180975d5c1012518e711c92ab26a4ff98218f439a97d9adbcd503b0d3ad1c8a) - - jekyll/builder:latest (Digest: sha256:4bc6a3b6eddebef1652ef38ceb965fc9c1b06677f65f764e1e17b88dc2aa9934) - - node:12-alpine (Digest: sha256:9623cd396644f9b2e595d833dc0188a880333674488d939338ab5fde10ef7c43) - - node:10-alpine (Digest: sha256:2f202af4d6baba655fef9c93f41a914b33ee576b9f55a6e69ba23b49e3b62766) - - alpine:3.9 (Digest: sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011) - - alpine:3.10 (Digest: sha256:f0e9534a598e501320957059cb2a23774b4d4072e37c7b2cf7e95b241f019e35) - - alpine:3.8 (Digest: sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14) - - ubuntu:14.04 (Digest: sha256:ffc76f71dd8be8c9e222d420dc96901a07b61616689a44c7b3ef6a10b7213de4) - - alpine:3.7 (Digest: sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10) - - mcr.microsoft.com/azure-pipelines/node8-typescript:latest (Digest: sha256:e52e60b9f71183969830a3664279b5d8c799b4b0ec2c25a0686f7c02f6a9669a) -- .NET Core SDK: - - 3.1.402 - - 3.1.401 - - 3.1.302 - - 3.1.301 - - 3.1.300 - - 3.1.202 - - 3.1.201 - - 3.1.200 - - 3.1.108 - - 3.1.107 - - 3.1.106 - - 3.1.105 - - 3.1.104 - - 3.1.103 - - 3.1.102 - - 3.1.101 - - 3.1.100 - - 3.0.103 - - 3.0.102 - - 3.0.101 - - 3.0.100 - - 2.1.810 - - 2.1.809 - - 2.1.808 - - 2.1.807 - - 2.1.806 - - 2.1.805 - - 2.1.804 - - 2.1.803 - - 2.1.802 - - 2.1.801 - - 2.1.701 - - 2.1.700 - - 2.1.615 - - 2.1.614 - - 2.1.613 - - 2.1.612 - - 2.1.611 - - 2.1.610 - - 2.1.609 - - 2.1.608 - - 2.1.607 - - 2.1.606 - - 2.1.605 - - 2.1.604 - - 2.1.603 - - 2.1.602 - - 2.1.518 - - 2.1.517 - - 2.1.516 - - 2.1.515 - - 2.1.514 - - 2.1.513 - - 2.1.512 - - 2.1.511 - - 2.1.510 - - 2.1.509 - - 2.1.508 - - 2.1.507 - - 2.1.506 - - 2.1.505 - - 2.1.504 - - 2.1.503 - - 2.1.502 - - 2.1.500 - - 2.1.403 - - 2.1.402 - - 2.1.401 - - 2.1.302 - - 2.1.301 - - 2.1.300 -- Erlang (Erlang (SMP,ASYNC_THREADS,HIPE) (BEAM) emulator version 11.0.3) -- Firefox (Mozilla Firefox 80.0.1) -- Geckodriver (0.27.0); Gecko Driver is available via GECKOWEBDRIVER environment variable -- GNU C++ 7.5.0 -- GNU C++ 8.4.0 -- GNU C++ 9.3.0 -- GNU Fortran 8.4.0 -- GNU Fortran 9.3.0 -- Git (2.28.0) -- Git Large File Storage (LFS) (2.12.0) -- Git-ftp (1.3.1) -- Hub CLI (2.14.2) -- GitHub CLI 0.12.0 -- Google Chrome (Google Chrome 85.0.4183.102 ) -- ChromeDriver 85.0.4183.87 (cd6713ebf92fa1cacc0f1a598df280093af0c5d7-refs/branch-heads/4183@{#1689}); Chrome Driver is available via CHROMEWEBDRIVER environment variable -- Google Cloud SDK (309.0.0) -- Haskell Cabal (cabal-install version 3.4.0.0 -compiled using version 3.4.0.0 of the Cabal library ) -- GHC (The Glorious Glasgow Haskell Compilation System, version 8.10.2) -- Haskell Stack (Version 2.3.3, Git revision cb44d51bed48b723a5deb08c3348c0b3ccfc437e x86_64 hpack-0.33.0) -- Heroku (heroku/7.42.13 linux-x64 node-v12.16.2) -- HHVM (HipHop VM 4.74.0 (rel)) -- ImageMagick -- Azul Zulu OpenJDK: - - 7 (openjdk version "1.7.0_272") -- Adopt OpenJDK: - - 8 (openjdk version "1.8.0_265") (default) - - 11 (openjdk version "11.0.8" 2020-07-14) - - 12 (openjdk version "12.0.2" 2019-07-16) -- Ant (Apache Ant(TM) version 1.10.5 compiled on March 28 2019) +- Image Version: 20200920.1 + +## Installed Software +### Language and Runtime +- GNU C++ 7.5.0, 8.4.0, 9.3.0 +- GNU Fortran 7.5.0, 8.4.0, 9.3.0 +- Clang 6.0.0, 8.0.0, 9.0.0 +- Erlang 11.0.3 +- Mono 6.12.0.90 +- Node 12.18.4 +- Python 2.7.17 +- Python3 3.6.9 +- PowerShell 7.0.3 +- Ruby 2.5.1p57 +- Swift 5.3 +- Julia 1.5.1 + +### Package Management +- Homebrew 2.5.1 +- Gem 3.1.4 +- Miniconda 4.8.3 +- Helm +- Npm 6.14.8 +- Yarn +- Pip 9.0.1 +- Pip3 9.0.1 +- Vcpkg 2020.06.15 + +### Project Management +- Ant 1.10.5 - Gradle 6.6.1 -- Maven (Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f)) -- Kind (kind v0.8.1 go1.14.2 linux/amd64) -- kubectl (Client Version: v1.19.1) -- helm (v3.3.1+g249e521) -- minikube version: v1.13.0 -- kustomize ({kustomize/v3.8.2 2020-08-29T17:44:01Z }) -- oc CLI Client Version: 4.5.0-202005291417-9933eb9 -- Leiningen (Leiningen 2.9.4 on Java 1.8.0_265 OpenJDK 64-Bit Server VM) -- Mercurial (Mercurial Distributed SCM (version 4.5.3)) -- Miniconda (conda 4.8.3) -- Mono (Mono JIT compiler version 6.12.0.90 (tarball Fri Sep 4 14:01:23 UTC 2020)) -- NuGet (NuGet Version: 5.5.0.6382) -- MySQL (mysql Ver 14.14 Distrib 5.7.31, for Linux (x86_64) using EditLine wrapper) +- Maven 3.6.3 +- Sbt 1.3.13 + +### Tools +- 7-Zip 16.02 +- Ansible 2.9.13 +- AzCopy10 10.6.0 (available by `azcopy10` alias) +- AzCopy7 7.3.0 (available by `azcopy` alias) +- Bazel 3.5.0 +- Bazelisk 1.6.1 +- Buildah +- CMake 3.17.0 +- curl 7.58.0 +- Docker Compose 1.27.3 +- Docker-Buildx 0.4.2 +- Docker-Moby 19.03.12 +- Git 2.28.0 +- Git LFS 2.12.0 +- Git-ftp 1.3.1 +- Google Cloud SDK 310.0.0 +- Haveged 1.9.1 +- Heroku 7.43.0 +- HHVM (HipHop VM) 4.75.0 +- jq 1.5 +- Kind 0.9.0 +- Kubectl 1.19.2 +- Kustomize 3.8.4 +- Leiningen 2.9.4 +- m4 1.4.18 +- Mercurial 4.5.3 +- Minikube 1.13.0 +- Newman 5.2.0 +- nvm 0.35.3 +- Packer 1.6.2 +- PhantomJS 2.1.1 +- Podman +- Skopeo 1.1.1 +- SVN 1.9.7 +- Swig 3.0.12 +- Terraform 0.13.3 +- unzip 6.00 +- wget 1.19.4 +- zip 3.0 +- zstd 1.3.3 + +### CLI Tools +- Alibaba Cloud CLI 3.0.59 +- AWS CLI 1.18.142 +- AWS CLI Session manager plugin 1.1.61.0 +- AWS SAM CLI 1.2.0 +- Azure CLI (azure-cli) 2.11.1 +- Azure CLI (azure-devops) 0.18.0 +- GitHub CLI +- Hub CLI 2.14.2 +- Netlify CLI 2.63.2 +- oc CLI 4.5.0 +- ORAS CLI 0.8.1 +- Vercel CLI 20.1.0 + +### Java +| Version | Vendor | Environment Variable | +| ------------------- | ------------ | -------------------- | +| 1.7.0_272 | Zulu | JAVA_HOME_7_X64 | +| 1.8.0_265 (default) | AdoptOpenJDK | JAVA_HOME_8_X64 | +| 11.0.8 | AdoptOpenJDK | JAVA_HOME_11_X64 | +| 12.0.2 | AdoptOpenJDK | JAVA_HOME_12_X64 | + +### PHP +| Tool | Version | +| -------- | --------------------------- | +| PHP | 7.1.33 7.2.33 7.3.22 7.4.10 | +| Composer | 1.10.13 | +| PHPUnit | 7.5.20 | + +### Haskell +- GHC 8.10.2 +- Cabal 3.4.0.0 +- Stack 2.3.3 + +### Rust Tools +- Rust 1.46.0 +- Rustup 1.22.1 +- Rustdoc 1.46.0 +- Cargo 1.46.0 + +#### Packages +- Bindgen 0.55.1 +- Cargo audit 0.12.0 +- Cargo outdated 0.9.11 +- Cargo clippy 0.0.212 +- Cbindgen 0.14.5 +- Rustfmt 1.4.18 + +### Browsers and Drivers +- Google Chrome 85.0.4183.102 +- ChromeDriver 85.0.4183.87 +- Mozilla Firefox 80.0.1 +- Geckodriver 0.27.0 + +### .NET Core SDK +- 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 2.1.508 2.1.509 2.1.510 2.1.511 2.1.512 2.1.513 2.1.514 2.1.515 2.1.516 2.1.517 2.1.518 2.1.602 2.1.603 2.1.604 2.1.605 2.1.606 2.1.607 2.1.608 2.1.609 2.1.610 2.1.611 2.1.612 2.1.613 2.1.614 2.1.615 2.1.700 2.1.701 2.1.801 2.1.802 2.1.803 2.1.804 2.1.805 2.1.806 2.1.807 2.1.808 2.1.809 2.1.810 3.0.100 3.0.101 3.0.102 3.0.103 3.1.100 3.1.101 3.1.102 3.1.103 3.1.104 3.1.105 3.1.106 3.1.107 3.1.108 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 + +### Az Module +- 1.0.0 1.6.0 2.3.2 2.6.0 2.8.0 3.1.0 3.5.0 3.8.0 4.3.0 4.4.0 4.6.0 + +### Databases +- Postgre SQL 12.4 +- MongoDB 4.4.1 +- sqlite3 3.22.0 + +#### MySQL +- MySQL 5.7.31 - MySQL Server (user:root password:root) - MS SQL Server Client Tools -- MySQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service' -- nvm (0.35.3) -- Node.js (v12.18.3) -- Grunt (grunt-cli v1.3.2) -- Gulp (CLI version: 2.3.0 -Local version: Unknown) -- n (6.7.0) -- Parcel (1.12.4) -- TypeScript (Version 4.0.2) -- Webpack (4.44.1) -- Webpack CLI (3.3.12) -- Yarn (1.22.5) -- Newman (5.2.0) -- Bazel (bazel 3.5.0) -- Bazelisk (1.6.1) -- ORAS CLI 0.8.1 -- PhantomJS (2.1.1) -- PHP 7.1 (PHP 7.1.33-17+ubuntu18.04.1+deb.sury.org+1 (cli) (built: Aug 7 2020 14:47:20) ( NTS )) -- PHP 7.2 (PHP 7.2.33-1+ubuntu18.04.1+deb.sury.org+1 (cli) (built: Aug 7 2020 14:44:29) ( NTS )) -- PHP 7.3 (PHP 7.3.22-1+ubuntu18.04.1+deb.sury.org+1 (cli) (built: Sep 9 2020 06:46:30) ( NTS )) -- PHP 7.4 (PHP 7.4.10 (cli) (built: Sep 9 2020 06:36:14) ( NTS )) -- Composer (Composer version 1.10.13 2020-09-09 11:46:34) -- PHPUnit (PHPUnit 7.5.20 by Sebastian Bergmann and contributors.) -- Pollinate -- psql (PostgreSQL) 12.4 -- Powershell (PowerShell 7.0.3) -- Pulumi v2.10.0 -- ruby (2.5.1p57) -- gem (3.1.4) -- OpenSSL 1.1.1g 21 Apr 2020 -- Libssl 1.1.1g-1+ubuntu18.04.1+deb.sury.org+1 -- R 4.0.2 -- rustup (1.22.1) -- rust (1.46.0) -- cargo (1.46.0) -- rustfmt (1.4.18-stable) -- clippy (0.0.212) -- rustdoc (1.46.0) -- bindgen (0.55.1) -- cbindgen (0.14.4) -- cargo audit (0.12.0) -- cargo outdated (v0.9.11) -- Julia (julia version 1.5.1) -- sbt (1.3.13) -- Selenium server standalone (available via SELENIUM_JAR_PATH environment variable) -- Sphinx Open Source Search Server -- Subversion (svn, version 1.9.7 (r1800392)) -- Terraform (Terraform v0.13.2) -- Packer (1.6.2) -- Vcpkg 2020.06.15-unknownhash -- Vercel CLI (20.1.0) -- MongoDB on Linux v4.4.1 -- Haveged 1.9.1-6 -- Swig 3.0.12 -- Netlify CLI (netlify-cli/2.63.0 linux-x64 node-v12.18.3) -- Google Repository 58 -- Google Play services 49 -- Google APIs 24 -- Google APIs 23 -- Google APIs 22 -- Google APIs 21 -- CMake 3.10.2.4988404 -3.6.4111459 -- Android SDK Platform-Tools 30.0.4 -- Android SDK Platform 30 -- Android SDK Platform 29 -- Android SDK Platform 28 -- Android SDK Platform 27 -- Android SDK Platform 26 -- Android SDK Platform 25 -- Android SDK Platform 24 -- Android SDK Platform 23 -- Android SDK Platform 22 -- Android SDK Platform 21 -- Android SDK Platform 19 -- Android SDK Platform 17 -- Android SDK Patch Applier v4 -- Android SDK Build-Tools 30.0.2 -- Android SDK Build-Tools 30.0.1 -- Android SDK Build-Tools 30.0.0 -- Android SDK Build-Tools 29.0.3 -- Android SDK Build-Tools 29.0.2 -- Android SDK Build-Tools 29.0.0 -- Android SDK Build-Tools 28.0.3 -- Android SDK Build-Tools 28.0.2 -- Android SDK Build-Tools 28.0.1 -- Android SDK Build-Tools 28.0.0 -- Android SDK Build-Tools 27.0.3 -- Android SDK Build-Tools 27.0.2 -- Android SDK Build-Tools 27.0.1 -- Android SDK Build-Tools 27.0.0 -- Android SDK Build-Tools 26.0.3 -- Android SDK Build-Tools 26.0.2 -- Android SDK Build-Tools 26.0.1 -- Android SDK Build-Tools 26.0.0 -- Android SDK Build-Tools 25.0.3 -- Android SDK Build-Tools 25.0.2 -- Android SDK Build-Tools 25.0.1 -- Android SDK Build-Tools 25.0.0 -- Android SDK Build-Tools 24.0.3 -- Android SDK Build-Tools 24.0.2 -- Android SDK Build-Tools 24.0.1 -- Android SDK Build-Tools 24.0.0 -- Android SDK Build-Tools 23.0.3 -- Android SDK Build-Tools 23.0.2 -- Android SDK Build-Tools 23.0.1 -- Android SDK Build-Tools 22.0.1 -- Android SDK Build-Tools 21.1.2 -- Android SDK Build-Tools 20.0.0 -- Android SDK Build-Tools 19.1.0 -- Android SDK Build-Tools 17.0.0 -- Android NDK 21.3.6528147 -- Az Module (1.0.0) -- Az Module (1.6.0) -- Az Module (2.3.2) -- Az Module (2.6.0) -- Az Module (2.8.0) -- Az Module (3.1.0) -- Az Module (3.5.0) -- Az Module (3.8.0) -- Az Module (4.3.0) -- Az Module (4.4.0) -- Az Module (4.6.0) -- Ruby: - - Ruby 2.4.10 - - Ruby 2.5.8 - - Ruby 2.6.6 - - Ruby 2.7.1 -- Python (Python 2.7.17) -- pip (pip 9.0.1 from /usr/lib/python2.7/dist-packages (python 2.7)) -- Python3 (Python 3.6.9) -- pip3 (pip 9.0.1 from /usr/lib/python3/dist-packages (python 3.6)) -- Python: - - Python 2.7.18 - - Python 3.5.10 - - Python 3.6.12 - - Python 3.7.9 - - Python 3.8.5 -- PyPy: - - PyPy 2.7.13 [PyPy 7.3.1 with GCC 7.3.1 20180303 (Red Hat 7.3.1-5)] - - PyPy 3.6.9 [PyPy 7.3.1 with GCC 7.3.1 20180303 (Red Hat 7.3.1-5)] -- node: - - node 8.17.0 - - node 10.22.0 - - node 12.18.3 - - node 14.10.1 -- go: - - go 1.11.13 - - go 1.12.17 - - go 1.13.15 - - go 1.14.9 - - go 1.15.2 -- boost: - - boost 1.69.0 - - boost 1.72.0 -- AWS SAM CLI, version 1.2.0 -- Homebrew on Linux (Homebrew 2.5.1 -Homebrew/linuxbrew-core (git revision d52011; last commit 2020-09-12)) + +``` + MySQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service' +``` +### Cached Tools +#### Ruby +- 2.4.10 +- 2.5.8 +- 2.6.6 +- 2.7.1 + +#### Python +- 2.7.18 +- 3.5.10 +- 3.6.12 +- 3.7.9 +- 3.8.5 + +#### PyPy +- 2.7.13 [PyPy 7.3.1] +- 3.6.9 [PyPy 7.3.1] + +#### Node.js +- 8.17.0 +- 10.22.1 +- 12.18.4 +- 14.11.0 + +#### Go +- 1.11.13 +- 1.12.17 +- 1.13.15 +- 1.14.9 +- 1.15.2 + +#### Boost +- 1.69.0 +- 1.72.0 + +### Android +| Package Name | Version | +| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android SDK Platform-Tools | 30.0.4 | +| Android SDK Tools | 26.1.1 | +| Android SDK Platforms | android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-19 (rev 4)
android-17 (rev 3) | +| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2
29.0.0 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0
17.0.0 | +| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | +| NDK | 21.3.6528147 | +| Android Support Repository | 47.0.0 | +| Google Play services | 49 | +| Google Repository | 58 | +| SDK Patch Applier v4 | 1 | +| CMake | 3.10.2
3.6.4111459 | + +### Cached Docker images +- alpine:3.7 +- alpine:3.8 +- alpine:3.9 +- alpine:3.10 +- buildpack-deps:stretch +- buildpack-deps:buster +- debian:8 +- debian:9 +- jekyll/builder +- mcr.microsoft.com/azure-pipelines/node8-typescript +- node:10 +- node:12 +- node:10-alpine +- node:12-alpine +- ubuntu:14.04 + +### Installed apt packages +- bison, brotli, bzip2, curl, dbus, dnsutils, dpkg, fakeroot, file, flex, ftp, gnupg2, iproute2, iputils-ping, jq, lib32z1, libc++-dev, libc++abi-dev, libcurl3, libgbm-dev, libgconf-2-4, libgtk-3-0, libsecret-1-dev, libsqlite3-dev, libunwind8, libxkbfile-dev, libxss1, locales, m4, netcat, openssh-client, parallel, patchelf, pkg-config, rpm, rsync, shellcheck, sqlite3, ssh, sudo, telnet, texinfo, time, tk, tzdata, unzip, upx, wget, xorriso, xvfb, xz-utils, yamllint, zip, zstd, zsync + + From 9cc2c6a139e1babe44f0ccebca0efe4bc73add51 Mon Sep 17 00:00:00 2001 From: Darii Nurgaleev Date: Thu, 24 Sep 2020 22:24:23 +0700 Subject: [PATCH 42/55] added bundles --- images/macos/toolsets/toolset-10.15.json | 7 +++++++ images/macos/toolsets/toolset-11.0.json | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 26c0cf19c..587da9613 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -21,6 +21,13 @@ ], "bundle-default": "latest", "bundles": [ + { + "symlink": "6_12_1", + "mono":"6.12", + "ios": "14.0", + "mac": "6.20", + "android": "11.0" + }, { "symlink": "6_12_0", "mono":"6.12", diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json index 3f139910d..c8988a4bc 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.0.json @@ -21,6 +21,13 @@ ], "bundle-default": "latest", "bundles": [ + { + "symlink": "6_12_1", + "mono":"6.12", + "ios": "14.0", + "mac": "6.20", + "android": "11.0" + }, { "symlink": "6_12_0", "mono":"6.12", From 72bd7db479417c7aca8386daa2a7c86f5a945871 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Thu, 24 Sep 2020 20:49:22 +0300 Subject: [PATCH 43/55] exclude Ubuntu16 --- images/linux/scripts/installers/gcc.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/gcc.sh b/images/linux/scripts/installers/gcc.sh index 914c3e1e0..b59eae7f6 100644 --- a/images/linux/scripts/installers/gcc.sh +++ b/images/linux/scripts/installers/gcc.sh @@ -4,6 +4,11 @@ ## Desc: Installs GNU C++ ################################################################################ +set -e + +# Source the helpers for use with the script +source $HELPER_SCRIPTS/os.sh + function InstallGcc { version=$1 @@ -26,10 +31,12 @@ versions=( "g++-7" "g++-8" "g++-9" - "g++-10" ) -for version in ${versions[*]} -do +if ! isUbuntu16; then + versions+=("g++-10") +fi + +for version in ${versions[*]}; do InstallGcc $version done From 85906da062ec55b2ab9d0f1070fc0df0be114f3c Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov Date: Thu, 24 Sep 2020 23:39:14 +0300 Subject: [PATCH 44/55] fix R and sphinx version output --- .../linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 35b5ec4de..99fad98b3 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -254,11 +254,11 @@ function Get-PulumiVersion { } function Get-RVersion { - $rVersion = R --version | Select-String "R version" | Take-OutputPart -Part -2 + $rVersion = (Get-CommandResult "R --version | grep 'R version'").Output | Take-OutputPart -Part 2 return "R $rVersion" } function Get-SphinxVersion { - $sphinxVersion = searchd | Take-OutputPart -Part 1 | Take-OutputPart -Part 0 -Delimiter "-" - return "Sphinx Open Source Search Server $rVersion" + $sphinxVersion = searchd -h | Select-Object -First 1 | Take-OutputPart -Part 1 | Take-OutputPart -Part 0 -Delimiter "-" + return "Sphinx Open Source Search Server $sphinxVersion" } \ No newline at end of file From 3ffe5b2edcd856a68b35fad13b872437cfea67b5 Mon Sep 17 00:00:00 2001 From: Darii Nurgaleev Date: Fri, 25 Sep 2020 12:09:37 +0700 Subject: [PATCH 45/55] xcode 12.0.1 --- images/macos/toolsets/toolset-10.15.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 587da9613..e4c92cce5 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -2,7 +2,7 @@ "xcode": { "default": "11.7", "versions": [ - "12.2_beta", "12", "12_beta", "11.7", "11.6", "11.5", "11.4.1", "11.4", "11.3.1", "11.2.1", "11.1", "11", "10.3" + "12.2_beta", "12.0.1", "12", "12_beta", "11.7", "11.6", "11.5", "11.4.1", "11.4", "11.3.1", "11.2.1", "11.1", "11", "10.3" ] }, "xamarin": { From 1f73bc3e70a6591e632ba3466e2e2138e92f85b4 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Fri, 25 Sep 2020 12:41:45 +0300 Subject: [PATCH 46/55] fix markdown output --- images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 267dcac3a..c9257407f 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -6,8 +6,7 @@ function Get-OSName { function Get-CPPVersions { $cppVersions = apt list --installed 2>&1 | Where-Object { $_ -match "g\+\+-\d+"} | ForEach-Object { - $_ -match "now (?\d+\.\d+\.\d+)-" | Out-Null - $Matches.version + & $_.Split("/")[0] --version | Select-Object -First 1 | Take-OutputPart -Part 3 } | Sort-Object {[Version]$_} return "GNU C++ " + ($cppVersions -Join ", ") } From e12653fe98f81f806ee07c8373172b8ea62b52e1 Mon Sep 17 00:00:00 2001 From: Vladimir Safonkin Date: Fri, 25 Sep 2020 14:08:34 +0300 Subject: [PATCH 47/55] Fix credentials in GenerateResourcesAndImage.ps1 --- helpers/GenerateResourcesAndImage.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 31d48ee65..2e773cec8 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -167,7 +167,9 @@ Function GenerateResourcesAndImage { New-AzStorageAccount -ResourceGroupName $ResourceGroupName -AccountName $storageAccountName -Location $AzureLocation -SkuName "Standard_LRS" $spDisplayName = [System.GUID]::NewGuid().ToString().ToUpper() - $sp = New-AzADServicePrincipal -DisplayName $spDisplayName -Password (ConvertTo-SecureString $ServicePrincipalClientSecret -AsPlainText -Force) + $credentials = New-Object -TypeName Microsoft.Azure.Commands.ActiveDirectory.PSADPasswordCredential -Property @{ + StartDate=Get-Date; EndDate=Get-Date -Year 2024; Password=$ServicePrincipalClientSecret} + $sp = New-AzADServicePrincipal -DisplayName $spDisplayName -PasswordCredential $credentials $spAppId = $sp.ApplicationId $spClientId = $sp.ApplicationId From ec87362e809b1c7bfb31f755a3571f4955e20796 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Fri, 25 Sep 2020 10:47:43 +0300 Subject: [PATCH 48/55] add clang-tidy --- images/linux/scripts/installers/clang.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/clang.sh b/images/linux/scripts/installers/clang.sh index c81cfd2a3..377a3607f 100644 --- a/images/linux/scripts/installers/clang.sh +++ b/images/linux/scripts/installers/clang.sh @@ -12,11 +12,11 @@ function InstallClang { local version=$1 echo "Installing clang-$version..." - if [[ $version =~ (9|10) ]]; then + if [[ $version =~ 9 ]] && isUbuntu16; then ./llvm.sh $version apt-get install -y "clang-format-$version" else - apt-get install -y "clang-$version" "lldb-$version" "lld-$version" "clang-format-$version" + apt-get install -y "clang-$version" "lldb-$version" "lld-$version" apt-get install -y "clang-format-$version" fi # Run tests to determine that the software installed as expected From f7ff25aead04b45cfeb303e54bbf9bd0daa8ed22 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Fri, 25 Sep 2020 14:48:00 +0300 Subject: [PATCH 49/55] move to the official repository --- images/linux/scripts/installers/clang.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/clang.sh b/images/linux/scripts/installers/clang.sh index 377a3607f..4a3424fd4 100644 --- a/images/linux/scripts/installers/clang.sh +++ b/images/linux/scripts/installers/clang.sh @@ -16,7 +16,7 @@ function InstallClang { ./llvm.sh $version apt-get install -y "clang-format-$version" else - apt-get install -y "clang-$version" "lldb-$version" "lld-$version" apt-get install -y "clang-format-$version" + apt-get install -y "clang-$version" "lldb-$version" "lld-$version" "clang-format-$version" fi # Run tests to determine that the software installed as expected From 932d0f36cdabe7e40fc8abb46469dcee1922b252 Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Fri, 25 Sep 2020 14:51:01 +0300 Subject: [PATCH 50/55] Add azure dev spaces to Windows (#1558) * add azds to windows images * add script to template * syntax improvments, persistent path value, proper documentation section Co-authored-by: Leonid Lapshin --- images/win/Windows2016-Azure.json | 1 + images/win/Windows2019-Azure.json | 1 + .../scripts/Installers/Install-AzureDevSpacesCLI.ps1 | 10 ++++++++++ .../SoftwareReport/SoftwareReport.Generator.ps1 | 1 + .../scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 7 ++++++- images/win/scripts/Tests/CLI.Tools.Tests.ps1 | 6 ++++++ 6 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 images/win/scripts/Installers/Install-AzureDevSpacesCLI.ps1 diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json index 6aa1423c6..7d44d22d9 100644 --- a/images/win/Windows2016-Azure.json +++ b/images/win/Windows2016-Azure.json @@ -209,6 +209,7 @@ "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzCopy.ps1", + "{{ template_dir }}/scripts/Installers/Install-AzureDevSpacesCli.ps1", "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1", "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1", "{{ template_dir }}/scripts/Installers/Install-7zip.ps1", diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json index 515caba9d..d519c0039 100644 --- a/images/win/Windows2019-Azure.json +++ b/images/win/Windows2019-Azure.json @@ -200,6 +200,7 @@ "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzCopy.ps1", + "{{ template_dir }}/scripts/Installers/Install-AzureDevSpacesCli.ps1", "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1", "{{ template_dir }}/scripts/Installers/Install-7zip.ps1", "{{ template_dir }}/scripts/Installers/Install-Packer.ps1", diff --git a/images/win/scripts/Installers/Install-AzureDevSpacesCLI.ps1 b/images/win/scripts/Installers/Install-AzureDevSpacesCLI.ps1 new file mode 100644 index 000000000..5f37fc581 --- /dev/null +++ b/images/win/scripts/Installers/Install-AzureDevSpacesCLI.ps1 @@ -0,0 +1,10 @@ +################################################################################ +## File: Install-AzureDevSpacesCLI.ps1 +## Desc: Install Azure Dev Spaces CLI +################################################################################ + +# Install Azure Dev Spaces CLI +Install-Binary -Url "https://aka.ms/get-azds-windows" -Name "Azure Dev Spaces CLI.exe" -ArgumentList ("/quiet") +Add-MachinePathItem -PathItem "C:\Program Files\Microsoft SDKs\Azure\Azure Dev Spaces CLI" + +Invoke-PesterTests -TestFile "CLI.Tools" -TestName "Azure Dev Spaces CLI" \ No newline at end of file diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index cc6130260..1aad21f29 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -112,6 +112,7 @@ $markdown += New-MDHeader "CLI Tools" -Level 3 $markdown += New-MDList -Style Unordered -Lines @( (Get-AzureCLIVersion), (Get-AzureDevopsExtVersion), + (Get-AZDSVersion), (Get-AWSCLIVersion), (Get-AWSSAMVersion), (Get-AWSSessionManagerVersion), diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index e7235408f..760b03d3c 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -246,4 +246,9 @@ function Get-VisualCPPComponents { } } } -} \ No newline at end of file +} + +function Get-AZDSVersion { + $azdsVersion = $(azds --version) | Select-String "(\d+\.\d+\.\d+.\d+)" + return "Azure Dev Spaces CLI $azdsVersion" +} diff --git a/images/win/scripts/Tests/CLI.Tools.Tests.ps1 b/images/win/scripts/Tests/CLI.Tools.Tests.ps1 index d230fcfcd..807914056 100644 --- a/images/win/scripts/Tests/CLI.Tools.Tests.ps1 +++ b/images/win/scripts/Tests/CLI.Tools.Tests.ps1 @@ -53,4 +53,10 @@ Describe "Hub CLI" { It "hub is installed" { "hub --version" | Should -ReturnZeroExitCode } +} + +Describe "Azure Dev Spaces CLI" { + It "Azure Dev Spaces CLI" { + "azds --version" | Should -ReturnZeroExitCode + } } \ No newline at end of file From 745e5b45ffbd5c5a16012f7fda9e675bc81d38b4 Mon Sep 17 00:00:00 2001 From: Vladimir Safonkin Date: Fri, 25 Sep 2020 15:00:21 +0300 Subject: [PATCH 51/55] Fix code style --- helpers/GenerateResourcesAndImage.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 2e773cec8..9718bc35a 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -167,8 +167,8 @@ Function GenerateResourcesAndImage { New-AzStorageAccount -ResourceGroupName $ResourceGroupName -AccountName $storageAccountName -Location $AzureLocation -SkuName "Standard_LRS" $spDisplayName = [System.GUID]::NewGuid().ToString().ToUpper() - $credentials = New-Object -TypeName Microsoft.Azure.Commands.ActiveDirectory.PSADPasswordCredential -Property @{ - StartDate=Get-Date; EndDate=Get-Date -Year 2024; Password=$ServicePrincipalClientSecret} + $credentialProperties = @{ StartDate=Get-Date; EndDate=Get-Date -Year 2024; Password=$ServicePrincipalClientSecret } + $credentials = New-Object -TypeName Microsoft.Azure.Commands.ActiveDirectory.PSADPasswordCredential -Property $credentialProperties $sp = New-AzADServicePrincipal -DisplayName $spDisplayName -PasswordCredential $credentials $spAppId = $sp.ApplicationId From 2f4d3598593f05840832ac695bfc421c51424671 Mon Sep 17 00:00:00 2001 From: Darii Nurgaleev Date: Fri, 25 Sep 2020 19:08:50 +0700 Subject: [PATCH 52/55] removed 12.0.1 --- images/macos/toolsets/toolset-10.15.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index e4c92cce5..587da9613 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -2,7 +2,7 @@ "xcode": { "default": "11.7", "versions": [ - "12.2_beta", "12.0.1", "12", "12_beta", "11.7", "11.6", "11.5", "11.4.1", "11.4", "11.3.1", "11.2.1", "11.1", "11", "10.3" + "12.2_beta", "12", "12_beta", "11.7", "11.6", "11.5", "11.4.1", "11.4", "11.3.1", "11.2.1", "11.1", "11", "10.3" ] }, "xamarin": { From 658a6a66425e85de43b66076eeca37762087a328 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov Date: Fri, 25 Sep 2020 16:25:39 +0300 Subject: [PATCH 53/55] add azure powershell v4.7.0 --- images/linux/toolsets/toolset-1604.json | 3 ++- images/linux/toolsets/toolset-1804.json | 3 ++- images/win/toolsets/toolset-2016.json | 3 ++- images/win/toolsets/toolset-2019.json | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index c8b2b1510..46aad66ad 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -109,7 +109,8 @@ "3.8.0", "4.3.0", "4.4.0", - "4.6.0" + "4.6.0", + "4.7.0" ] } ], diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 6311cc1a1..2670b4cf3 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -105,7 +105,8 @@ "3.8.0", "4.3.0", "4.4.0", - "4.6.0" + "4.6.0", + "4.7.0" ] } ], diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index c764e0802..856df7527 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -121,7 +121,8 @@ "3.8.0", "4.3.0", "4.4.0", - "4.6.0" + "4.6.0", + "4.7.0" ] } ], diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 7184dc037..20f05bf87 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -130,7 +130,8 @@ "3.8.0", "4.3.0", "4.4.0", - "4.6.0" + "4.6.0", + "4.7.0" ] } ], From c49245208d51cb436461a692394c30d2aa5af75a Mon Sep 17 00:00:00 2001 From: Hutson Betts Date: Fri, 25 Sep 2020 12:49:52 -0500 Subject: [PATCH 54/55] fix(win): use correct case sensitive file name File name was submitted with `CLI` in `AzureDevSpacesCLI` capitalized, but the script is invoked as a provisioner using the lower-case `Cli` form as seen in `AzureDevSpacesCli`. Renaming the file to use the lower-case form to match other provisioning scripts used in the Windows builds. Issue introduced in commit 932d0f36cdabe7e40fc8abb46469dcee1922b252 --- ...nstall-AzureDevSpacesCLI.ps1 => Install-AzureDevSpacesCli.ps1} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename images/win/scripts/Installers/{Install-AzureDevSpacesCLI.ps1 => Install-AzureDevSpacesCli.ps1} (100%) diff --git a/images/win/scripts/Installers/Install-AzureDevSpacesCLI.ps1 b/images/win/scripts/Installers/Install-AzureDevSpacesCli.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-AzureDevSpacesCLI.ps1 rename to images/win/scripts/Installers/Install-AzureDevSpacesCli.ps1 From 79beb8514c6bd92d83e5a237500423b058c0454d Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Mon, 28 Sep 2020 12:50:18 +0300 Subject: [PATCH 55/55] fix Get-CodeQLBundleVersion output --- images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 2 ++ images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 28a07dce9..2f45ecde1 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -1,3 +1,5 @@ +$ErrorActionPreference = "Stop" + Import-Module MarkdownPS Import-Module (Join-Path $PSScriptRoot "SoftwareReport.Android.psm1") -DisableNameChecking Import-Module (Join-Path $PSScriptRoot "SoftwareReport.Browsers.psm1") -DisableNameChecking diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 85c73c151..0c0f39f55 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -34,7 +34,7 @@ function Get-CodeQLBundleVersion { $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "codeql" | Join-Path -ChildPath "*" $CodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Select-Object -First 1 -Expand FullName $CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql.exe" - $CodeQLVersion = $($CodeQLPath version --quiet) + $CodeQLVersion = & $CodeQLPath version --quiet return "CodeQL Action Bundle $CodeQLVersion" }