actions/runner-images-sangeeth
1
0
Fork 0
mirror of https://github.com/actions/runner-images-sangeeth.git synced 2025-12-20 06:29:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Windows|Ubuntu] Remove obsolete workarounds (#7431)

Browse Source
This commit is contained in:
Vasilii Polikarpov
2023-04-17 13:31:56 +02:00
committed by GitHub
parent 0f23104156
commit 5657dec7af
3 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1
View File

@@ -182,10 +182,7 @@ function Get-NvmVersion {
} }
function Get-PackerVersion { function Get-PackerVersion {
# Packer 1.7.1 has a bug and outputs version to stderr instead of stdout https://github.com/hashicorp/packer/issues/10855 return "Packer $(packer --version)"
$result = (Get-CommandResult "packer --version").Output
$packerVersion = [regex]::matches($result, "(\d+.){2}\d+").Value
return $packerVersion
} }
function Get-PhantomJSVersion { function Get-PhantomJSVersion {

6
images/linux/scripts/base/apt.sh
View File

@@ -31,11 +31,7 @@ EOF
# Uninstall unattended-upgrades # Uninstall unattended-upgrades
apt-get purge unattended-upgrades apt-get purge unattended-upgrades
# Need to limit arch for default apt repos due to echo 'APT sources'
# https://github.com/actions/runner-images/issues/1961
sed -i'' -E 's/^deb http:\/\/(azure.archive|security).ubuntu.com/deb [arch=amd64,i386] http:\/\/\1.ubuntu.com/' /etc/apt/sources.list
echo 'APT sources limited to the actual architectures'
cat /etc/apt/sources.list cat /etc/apt/sources.list
apt-get update apt-get update

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

@@ -142,10 +142,7 @@ function Get-OpenSSLVersion {
} }
function Get-PackerVersion { function Get-PackerVersion {
# Packer 1.7.1 has a bug and outputs version to stderr instead of stdout https://github.com/hashicorp/packer/issues/10855 return "Packer $(packer --version)"
($(cmd /c "packer --version 2>&1") | Out-String) -match "(?<version>(\d+.){2}\d+)" | Out-Null
$packerVersion = $Matches.Version
return $packerVersion
} }
function Get-ParcelVersion { function Get-ParcelVersion {