From f4cc7331d92b3d730b291e4f9ab359e132b425a8 Mon Sep 17 00:00:00 2001 From: "Image generation service account." Date: Mon, 29 Jul 2024 10:52:19 +0000 Subject: [PATCH 1/7] Updating readme file for macos-14 version 20240728.1 --- images/macos/macos-14-Readme.md | 49 ++++++++++++++++----------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index 4909b287e..5d2d97cd6 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| | [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | -| [[macOS] Default Xcode on macOS 14 Sonoma will be set to Xcode 15.4 on July, 22](https://github.com/actions/runner-images/issues/10121) | *** # macOS 14 - OS Version: macOS 14.5 (23F79) - Kernel Version: Darwin 23.5.0 -- Image Version: 20240722.3 +- Image Version: 20240728.1 ## Installed Software @@ -39,7 +38,7 @@ - Homebrew 4.3.10 - NPM 10.7.0 - NuGet 6.3.1.1 -- Pip3 24.1.2 (python 3.12) +- Pip3 24.2 (python 3.12) - Pipx 1.6.0 - RubyGems 3.5.16 - Yarn 1.22.22 @@ -56,7 +55,7 @@ - bazel 7.2.1 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.8.0 +- Curl 8.9.0 - Git 2.45.2 - Git LFS 3.5.1 - GitHub CLI 2.53.0 @@ -71,17 +70,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.14 +- AWS CLI 2.17.18 - AWS SAM CLI 1.120.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.29.45 +- Bicep CLI 0.29.47 - Cmake 3.30.1 -- CodeQL Action Bundle 2.18.0 -- Fastlane 2.221.1 +- CodeQL Action Bundle 2.18.1 +- Fastlane 2.222.0 - SwiftFormat 0.54.2 -- Xcbeautify 2.4.1 +- Xcbeautify 2.5.0 - Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.5.0 @@ -91,12 +90,12 @@ ### Browsers - Safari 17.5 (19618.2.12.11.6) - SafariDriver 17.5 (19618.2.12.11.6) -- Google Chrome 126.0.6478.183 -- Google Chrome for Testing 126.0.6478.182 -- ChromeDriver 126.0.6478.182 -- Microsoft Edge 126.0.2592.113 -- Microsoft Edge WebDriver 126.0.2592.102 -- Mozilla Firefox 128.0 +- Google Chrome 127.0.6533.73 +- Google Chrome for Testing 127.0.6533.72 +- ChromeDriver 127.0.6533.72 +- Microsoft Edge 127.0.2651.74 +- Microsoft Edge WebDriver 127.0.2651.78 +- Mozilla Firefox 128.0.3 - geckodriver 0.34.0 - Selenium server 4.23.0 @@ -110,7 +109,7 @@ ### Java | Version | Environment Variable | | -------------------- | -------------------- | -| 8.0.422+5 | JAVA_HOME_8_X64 | +| 8.0.422+5.1 | JAVA_HOME_8_X64 | | 11.0.24+8 | JAVA_HOME_11_X64 | | 17.0.12+7 | JAVA_HOME_17_X64 | | 21.0.4+7.0 (default) | JAVA_HOME_21_X64 | @@ -129,7 +128,7 @@ #### Node.js - 18.20.4 -- 20.15.1 +- 20.16.0 #### Go - 1.20.14 @@ -137,17 +136,17 @@ - 1.22.5 ### Rust Tools -- Cargo 1.79.0 -- Rust 1.79.0 -- Rustdoc 1.79.0 +- Cargo 1.80.0 +- Rust 1.80.0 +- Rustdoc 1.80.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.79 +- Clippy 0.1.80 - Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.4.3 +- PowerShell 7.4.4 #### PowerShell Modules - Az: 12.1.0 @@ -157,7 +156,7 @@ ### Xcode | Version | Build | Path | | -------------- | -------- | --------------------------------- | -| 16.0 (beta) | 16A5202i | /Applications/Xcode_16_beta_3.app | +| 16.0 (beta) | 16A5211f | /Applications/Xcode_16_beta_4.app | | 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | | 15.3 | 15E204a | /Applications/Xcode_15.3.app | | 15.2 | 15C500b | /Applications/Xcode_15.2.app | @@ -210,8 +209,8 @@ | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | @@ -219,8 +218,8 @@ | visionOS 2.0 | xros2.0 | 16.0 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | From 3b1c7f3c1d896eae98103c0c569b8eb10172f5e0 Mon Sep 17 00:00:00 2001 From: "Image generation service account." Date: Tue, 30 Jul 2024 08:08:02 +0000 Subject: [PATCH 2/7] Updating readme file for macos-13 version 20240728.2 --- images/macos/macos-13-Readme.md | 49 ++++++++++++++++----------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 2f5be0a0d..75faf50b0 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| | [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | -| [[macOS] Default Xcode on macOS 14 Sonoma will be set to Xcode 15.4 on July, 22](https://github.com/actions/runner-images/issues/10121) | *** # macOS 13 - OS Version: macOS 13.6.7 (22G720) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240721.3 +- Image Version: 20240728.2 ## Installed Software @@ -39,10 +38,10 @@ - Homebrew 4.3.10 - NPM 10.7.0 - NuGet 6.3.1.1 -- Pip3 24.1.2 (python 3.12) +- Pip3 24.2 (python 3.12) - Pipx 1.6.0 - RubyGems 3.5.16 -- Vcpkg 2024 (build from commit 821100d96) +- Vcpkg 2024 (build from commit cacf59943) - Yarn 1.22.22 ### Project Management @@ -57,7 +56,7 @@ - bazel 7.2.1 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.8.0 +- Curl 8.9.0 - Git 2.45.2 - Git LFS 3.5.1 - GitHub CLI 2.53.0 @@ -72,17 +71,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.14 +- AWS CLI 2.17.18 - AWS SAM CLI 1.120.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.29.45 +- Bicep CLI 0.29.47 - Cmake 3.30.1 -- CodeQL Action Bundle 2.18.0 -- Fastlane 2.221.1 -- SwiftFormat 0.54.1 -- Xcbeautify 2.4.1 +- CodeQL Action Bundle 2.18.1 +- Fastlane 2.222.0 +- SwiftFormat 0.54.3 +- Xcbeautify 2.5.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.5.0 @@ -92,12 +91,12 @@ ### Browsers - Safari 17.5 (18618.2.12.111.5) - SafariDriver 17.5 (18618.2.12.111.5) -- Google Chrome 126.0.6478.183 -- Google Chrome for Testing 126.0.6478.182 -- ChromeDriver 126.0.6478.182 -- Microsoft Edge 126.0.2592.113 -- Microsoft Edge WebDriver 126.0.2592.102 -- Mozilla Firefox 128.0 +- Google Chrome 127.0.6533.73 +- Google Chrome for Testing 127.0.6533.72 +- ChromeDriver 127.0.6533.72 +- Microsoft Edge 127.0.2651.74 +- Microsoft Edge WebDriver 127.0.2651.78 +- Mozilla Firefox 128.0.3 - geckodriver 0.34.0 - Selenium server 4.23.0 @@ -111,7 +110,7 @@ ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.422+5 | JAVA_HOME_8_X64 | +| 8.0.422+5.1 | JAVA_HOME_8_X64 | | 11.0.24+8 | JAVA_HOME_11_X64 | | 17.0.12+7 (default) | JAVA_HOME_17_X64 | | 21.0.4+7.0 | JAVA_HOME_21_X64 | @@ -139,7 +138,7 @@ #### Node.js - 16.20.2 - 18.20.4 -- 20.15.1 +- 20.16.0 #### Go - 1.20.14 @@ -147,17 +146,17 @@ - 1.22.5 ### Rust Tools -- Cargo 1.79.0 -- Rust 1.79.0 -- Rustdoc 1.79.0 +- Cargo 1.80.0 +- Rust 1.80.0 +- Rustdoc 1.80.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.79 +- Clippy 0.1.80 - Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.4.3 +- PowerShell 7.4.4 #### PowerShell Modules - Az: 12.1.0 @@ -211,8 +210,8 @@ | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | From c110803508288b27192223b8e853dcc6a16c379f Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Tue, 30 Jul 2024 14:05:45 +0530 Subject: [PATCH 3/7] Pinned the version of gitversion (#10363) --- images/windows/toolsets/toolset-2019.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 71755ce89..cbf2bb4e7 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -424,7 +424,7 @@ { "name": "aria2" }, { "name": "azcopy10" }, { "name": "Bicep" }, - { "name": "gitversion.portable" }, + { "name": "gitversion.portable", "args": [ "--version", "5.12.0"] }, { "name": "innosetup" }, { "name": "jq" }, { "name": "NuGet.CommandLine" }, From 1850dfc713405fe2f2af87161ff4b095a38830eb Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Tue, 30 Jul 2024 11:19:59 +0200 Subject: [PATCH 4/7] Add AllowedInboundIpAddresses parameter to build-image.ps1 (#10362) --- images.CI/linux-and-win/build-image.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/images.CI/linux-and-win/build-image.ps1 b/images.CI/linux-and-win/build-image.ps1 index 7abfdfd92..f1c4ce607 100644 --- a/images.CI/linux-and-win/build-image.ps1 +++ b/images.CI/linux-and-win/build-image.ps1 @@ -10,7 +10,8 @@ param( [String] [Parameter (Mandatory=$true)] $TenantId, [String] [Parameter (Mandatory=$false)] $VirtualNetworkName, [String] [Parameter (Mandatory=$false)] $VirtualNetworkRG, - [String] [Parameter (Mandatory=$false)] $VirtualNetworkSubnet + [String] [Parameter (Mandatory=$false)] $VirtualNetworkSubnet, + [String] [Parameter (Mandatory=$false)] $AllowedInboundIpAddresses = "[]" ) if (-not (Test-Path $TemplatePath)) @@ -54,6 +55,7 @@ packer build -var "client_id=$ClientId" ` -var "virtual_network_name=$VirtualNetworkName" ` -var "virtual_network_resource_group_name=$VirtualNetworkRG" ` -var "virtual_network_subnet_name=$VirtualNetworkSubnet" ` + -var "allowed_inbound_ip_addresses=$($AllowedInboundIpAddresses)" ` -color=false ` $TemplatePath ` | Where-Object { From 137d0ed83df01392245b4d940968fd44ae9b8ddd Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Tue, 30 Jul 2024 16:03:15 +0530 Subject: [PATCH 5/7] Pin sql version for win-19 (#10366) --- images/windows/toolsets/toolset-2019.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index cbf2bb4e7..06e41169e 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -84,7 +84,7 @@ {"name": "PowerShellGet"}, {"name": "PSScriptAnalyzer"}, {"name": "PSWindowsUpdate"}, - {"name": "SqlServer"}, + {"name": "SqlServer", "versions": ["22.2.0"]}, {"name": "VSSetup"}, {"name": "Microsoft.Graph"}, {"name": "AWSPowershell"} From 582bbb9c159ff592869037a139124e4bc5e29432 Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Tue, 30 Jul 2024 21:38:05 +0530 Subject: [PATCH 6/7] [Ubuntu] Deprecating docker compose v1 from ubuntu images (#10368) * Deprecating docker compose v1 from un=buntu images * Pin sql version for win-19 --- .../scripts/build/install-docker-compose.sh | 21 ------------------- .../docs-gen/Generate-SoftwareReport.ps1 | 3 --- .../docs-gen/SoftwareReport.Tools.psm1 | 5 +---- images/ubuntu/scripts/tests/Tools.Tests.ps1 | 6 ------ images/ubuntu/templates/ubuntu-20.04.pkr.hcl | 2 +- images/ubuntu/templates/ubuntu-22.04.pkr.hcl | 2 +- 6 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 images/ubuntu/scripts/build/install-docker-compose.sh diff --git a/images/ubuntu/scripts/build/install-docker-compose.sh b/images/ubuntu/scripts/build/install-docker-compose.sh deleted file mode 100644 index 4d152c77c..000000000 --- a/images/ubuntu/scripts/build/install-docker-compose.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -e -################################################################################ -## File: install-docker-compose.sh -## Desc: Install Docker Compose v1 -## Supply chain security: Docker Compose v1 - checksum validation -################################################################################ - -# Source the helpers for use with the script -source $HELPER_SCRIPTS/install.sh - -# Download docker-compose v1 from releases -binary_path=$(download_with_retry "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Linux-x86_64") - -# Supply chain security - Docker Compose v1 -external_hash="f3f10cf3dbb8107e9ba2ea5f23c1d2159ff7321d16f0a23051d68d8e2547b323" -use_checksum_comparison "${binary_path}" "${external_hash}" - -# Install docker-compose v1 -install "${binary_path}" "/usr/local/bin/docker-compose" - -invoke_tests "Tools" "Docker-compose v1" diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 index 3d335752d..0688c8055 100644 --- a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -111,9 +111,6 @@ $tools.AddToolVersion("Buildah", $(Get-BuildahVersion)) $tools.AddToolVersion("CMake", $(Get-CMakeVersion)) $tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion)) $tools.AddToolVersion("Docker Amazon ECR Credential Helper", $(Get-DockerAmazonECRCredHelperVersion)) -if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { - $tools.AddToolVersion("Docker Compose v1", $(Get-DockerComposeV1Version)) -} $tools.AddToolVersion("Docker Compose v2", $(Get-DockerComposeV2Version)) $tools.AddToolVersion("Docker-Buildx", $(Get-DockerBuildxVersion)) $tools.AddToolVersion("Docker Client", $(Get-DockerClientVersion)) diff --git a/images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 index a61b0a8d7..b4656b779 100644 --- a/images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 +++ b/images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 @@ -58,10 +58,7 @@ function Get-CMakeVersion { return $cmakeVersion } -function Get-DockerComposeV1Version { - $composeVersion = docker-compose -v | Get-StringPart -Part 2 | Get-StringPart -Part 0 -Delimiter "," - return $composeVersion -} + function Get-DockerComposeV2Version { $composeVersion = docker compose version | Get-StringPart -Part 3 | Get-StringPart -Part 0 -Delimiter "v" diff --git a/images/ubuntu/scripts/tests/Tools.Tests.ps1 b/images/ubuntu/scripts/tests/Tools.Tests.ps1 index 6e6ec0af0..cb9c07308 100644 --- a/images/ubuntu/scripts/tests/Tools.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Tools.Tests.ps1 @@ -121,12 +121,6 @@ Describe "Docker images" { } } -Describe "Docker-compose v1" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { - It "docker-compose" { - "docker-compose --version"| Should -ReturnZeroExitCode - } -} - Describe "Ansible" { It "Ansible" { "ansible --version" | Should -ReturnZeroExitCode diff --git a/images/ubuntu/templates/ubuntu-20.04.pkr.hcl b/images/ubuntu/templates/ubuntu-20.04.pkr.hcl index 101c5a3bf..d8d821bcd 100644 --- a/images/ubuntu/templates/ubuntu-20.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-20.04.pkr.hcl @@ -344,7 +344,7 @@ build { provisioner "shell" { environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DOCKERHUB_LOGIN=${var.dockerhub_login}", "DOCKERHUB_PASSWORD=${var.dockerhub_password}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/../scripts/build/install-docker-compose.sh", "${path.root}/../scripts/build/install-docker.sh"] + scripts = ["${path.root}/../scripts/build/install-docker.sh"] } provisioner "shell" { diff --git a/images/ubuntu/templates/ubuntu-22.04.pkr.hcl b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl index 9b881a686..6dd0abf17 100644 --- a/images/ubuntu/templates/ubuntu-22.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl @@ -340,7 +340,7 @@ build { provisioner "shell" { environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DOCKERHUB_LOGIN=${var.dockerhub_login}", "DOCKERHUB_PASSWORD=${var.dockerhub_password}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/../scripts/build/install-docker-compose.sh", "${path.root}/../scripts/build/install-docker.sh"] + scripts = ["${path.root}/../scripts/build/install-docker.sh"] } provisioner "shell" { From da684ca6d2b6de512a4dec746c7c134d2b010626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enes=20=C3=87ak=C4=B1r?= Date: Tue, 30 Jul 2024 20:11:12 +0300 Subject: [PATCH 7/7] [Ubuntu] Make brew version check consistent (#10369) `Tools.Tests.ps1` checks the version of `brew` with `--version` argument. ```powershell Describe "Homebrew" { It "homebrew" { "/home/linuxbrew/.linuxbrew/bin/brew --version" | Should -ReturnZeroExitCode } } ``` `SoftwareReport.Common.psm1` checks it with `-v` argument. ```powershell function Get-HomebrewVersion { $result = Get-CommandResult "/home/linuxbrew/.linuxbrew/bin/brew -v" $result.Output -match "Homebrew (?\d+\.\d+\.\d+)" | Out-Null return $Matches.version } ``` Generally, `--version` and `-v` are equivalent. But a recent bug in `brew` makes `-v` returns the output of `brew help`. https://github.com/Homebrew/brew/pull/17903 It's best to maintain consistency in version checks and explicitly use `--version` in both places. --- images/ubuntu/scripts/docs-gen/SoftwareReport.Common.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/ubuntu/scripts/docs-gen/SoftwareReport.Common.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Common.psm1 index 62e39cae7..73e3e1f3e 100644 --- a/images/ubuntu/scripts/docs-gen/SoftwareReport.Common.psm1 +++ b/images/ubuntu/scripts/docs-gen/SoftwareReport.Common.psm1 @@ -131,7 +131,7 @@ function Get-LernaVersion { } function Get-HomebrewVersion { - $result = Get-CommandResult "/home/linuxbrew/.linuxbrew/bin/brew -v" + $result = Get-CommandResult "/home/linuxbrew/.linuxbrew/bin/brew --version" $result.Output -match "Homebrew (?\d+\.\d+\.\d+)" | Out-Null return $Matches.version }