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

[Ubuntu] Do not install erlang on 18.04 (#7212)

Browse Source 
* [Ubuntu] Do not install erlang on 18.04

* fixup
This commit is contained in:
Mikhail Koliada
2023-03-01 17:11:12 +01:00
committed by GitHub
parent fec7951493
commit 02e4e5a6a0
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,7 @@ $languageAndRuntime.AddToolVersionsListInline("Clang", $(Get-ClangToolVersions -
$languageAndRuntime.AddToolVersionsListInline("Clang-format", $(Get-ClangToolVersions -ToolName "clang-format"), "^\d+") $languageAndRuntime.AddToolVersionsListInline("Clang-format", $(Get-ClangToolVersions -ToolName "clang-format"), "^\d+")
$languageAndRuntime.AddToolVersionsListInline("Clang-tidy", $(Get-ClangTidyVersions), "^\d+") $languageAndRuntime.AddToolVersionsListInline("Clang-tidy", $(Get-ClangTidyVersions), "^\d+")
$languageAndRuntime.AddToolVersion("Dash", $(Get-DashVersion)) $languageAndRuntime.AddToolVersion("Dash", $(Get-DashVersion))
if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { if (Test-IsUbuntu20) {
$languageAndRuntime.AddToolVersion("Erlang", $(Get-ErlangVersion)) $languageAndRuntime.AddToolVersion("Erlang", $(Get-ErlangVersion))
$languageAndRuntime.AddToolVersion("Erlang rebar3", $(Get-ErlangRebar3Version)) $languageAndRuntime.AddToolVersion("Erlang rebar3", $(Get-ErlangRebar3Version))
} }

2
images/linux/scripts/tests/Tools.Tests.ps1
View File

@@ -132,7 +132,7 @@ Describe "Cmake" {
} }
} }
Describe "erlang" -Skip:(Test-IsUbuntu22) { Describe "erlang" -Skip:((Test-IsUbuntu22) -or (Test-IsUbuntu18)) {
$testCases = @("erl -version", "erlc -v", "rebar3 -v") | ForEach-Object { @{ErlangCommand = $_} } $testCases = @("erl -version", "erlc -v", "rebar3 -v") | ForEach-Object { @{ErlangCommand = $_} }
It "erlang <ErlangCommand>" -TestCases $testCases { It "erlang <ErlangCommand>" -TestCases $testCases {

1
images/linux/ubuntu1804.json
View File

@@ -206,7 +206,6 @@
"{{template_dir}}/scripts/installers/codeql-bundle.sh", "{{template_dir}}/scripts/installers/codeql-bundle.sh",
"{{template_dir}}/scripts/installers/containers.sh", "{{template_dir}}/scripts/installers/containers.sh",
"{{template_dir}}/scripts/installers/dotnetcore-sdk.sh", "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh",
"{{template_dir}}/scripts/installers/erlang.sh",
"{{template_dir}}/scripts/installers/firefox.sh", "{{template_dir}}/scripts/installers/firefox.sh",
"{{template_dir}}/scripts/installers/microsoft-edge.sh", "{{template_dir}}/scripts/installers/microsoft-edge.sh",
"{{template_dir}}/scripts/installers/gcc.sh", "{{template_dir}}/scripts/installers/gcc.sh",