actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-14 13:17:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix environment variable

Browse Source
This commit is contained in:
Aleksandr Chebotov
2020-09-14 11:31:41 +03:00
parent 370986d0f0
commit 3e90bb832a
5 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1
View File

@@ -13,7 +13,7 @@ function Get-SqliteVersion {
return "sqlite3 $sqliteVersion" return "sqlite3 $sqliteVersion"
} }
function Get-MySqlVersion { function Get-MySQLVersion {
$mySqlVersion = (mysql --version).Split("/usr/bin/")[1] $mySqlVersion = (mysql --version).Split("/usr/bin/")[1]
return "MySQL ($mySqlVersion)" return "MySQL ($mySqlVersion)"
} }
@@ -23,7 +23,7 @@ function Build-MySQLSection {
$output += New-MDHeader "MySQL" -Level 4 $output += New-MDHeader "MySQL" -Level 4
$output += New-MDList -Style Unordered -Lines @( $output += New-MDList -Style Unordered -Lines @(
(Get-MySqlVersion), (Get-MySQLVersion ),
"MySQL Server (user:root password:root)", "MySQL Server (user:root password:root)",
"MS SQL Server Client Tools" "MS SQL Server Client Tools"
) )

4
images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
View File

@@ -4,7 +4,7 @@ param (
) )
# Install MarkdownPS module for software report generation # Install MarkdownPS module for software report generation
Install-Module MarkdownPS -Force -Scope CurrentUser Install-Module MarkdownPS -Force
Import-Module MarkdownPS Import-Module MarkdownPS
Import-Module (Join-Path $PSScriptRoot "SoftwareReport.CachedTools.psm1") -DisableNameChecking Import-Module (Join-Path $PSScriptRoot "SoftwareReport.CachedTools.psm1") -DisableNameChecking
Import-Module (Join-Path $PSScriptRoot "SoftwareReport.Common.psm1") -DisableNameChecking Import-Module (Join-Path $PSScriptRoot "SoftwareReport.Common.psm1") -DisableNameChecking
@@ -28,7 +28,7 @@ $OSName = Get-OSName
$markdown += New-MDHeader "$OSName" -Level 1 $markdown += New-MDHeader "$OSName" -Level 1
$markdown += New-MDList -Style Unordered -Lines @( $markdown += New-MDList -Style Unordered -Lines @(
"Image Version: $env:ImageVersion" "Image Version: $env:IMAGE_VERSION"
) )
$markdown += New-MDHeader "Installed Software" -Level 2 $markdown += New-MDHeader "Installed Software" -Level 2

5
images/linux/ubuntu1604.json
View File

@@ -293,11 +293,12 @@
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
}, },
{ {
"type": "powershell", "type": "shell",
"inline": [ "inline": [
"pwsh -File '{{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1' -OutputDirectory '{{user `image_folder`}}'" "sudo 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`}}", "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}",
"ANNOUNCEMENTS={{user `announcements`}}" "ANNOUNCEMENTS={{user `announcements`}}"
] ]

5
images/linux/ubuntu1804.json
View File

@@ -297,11 +297,12 @@
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
}, },
{ {
"type": "powershell", "type": "shell",
"inline": [ "inline": [
"pwsh -File '{{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1' -OutputDirectory '{{user `image_folder`}}'" "sudo 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`}}", "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}",
"ANNOUNCEMENTS={{user `announcements`}}" "ANNOUNCEMENTS={{user `announcements`}}"
] ]

5
images/linux/ubuntu2004.json
View File

@@ -299,11 +299,12 @@
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
}, },
{ {
"type": "powershell", "type": "shell",
"inline": [ "inline": [
"pwsh -File '{{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1' -OutputDirectory '{{user `image_folder`}}'" "sudo 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`}}", "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}",
"ANNOUNCEMENTS={{user `announcements`}}" "ANNOUNCEMENTS={{user `announcements`}}"
] ]