From 8f1e4ff32f32dd5d6ebc218e9aaba388f5a0c72f Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 18 Aug 2021 10:35:29 +0000 Subject: [PATCH] [Ubuntu] add aria2 to toolset (#3916) aria2 is already installed as part of https://github.com/actions/virtual-environments/blob/133db654885e1796cc158ab04f9217826294857a/images/linux/scripts/base/apt.sh#L29 This change will add aria2 to the list of apt packages in generated README --- images/linux/scripts/base/apt.sh | 4 ++-- images/linux/scripts/tests/Apt.Tests.ps1 | 5 +++++ images/linux/toolsets/toolset-1804.json | 1 + images/linux/toolsets/toolset-2004.json | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/base/apt.sh b/images/linux/scripts/base/apt.sh index da0ad4313..c764b3b62 100644 --- a/images/linux/scripts/base/apt.sh +++ b/images/linux/scripts/base/apt.sh @@ -25,8 +25,8 @@ echo 'APT sources limited to the actual architectures' cat /etc/apt/sources.list apt-get update -# Install aria2 , jq -apt-get install aria2 jq +# Install jq +apt-get install jq # Install apt-fast using quick-install.sh # https://github.com/ilikenwf/apt-fast diff --git a/images/linux/scripts/tests/Apt.Tests.ps1 b/images/linux/scripts/tests/Apt.Tests.ps1 index e9e5ac6d3..c1b37e29a 100644 --- a/images/linux/scripts/tests/Apt.Tests.ps1 +++ b/images/linux/scripts/tests/Apt.Tests.ps1 @@ -14,6 +14,11 @@ Describe "Apt" { $toolName = "getfacl" } + if ($toolName -eq "aria2") + { + $toolName = "aria2c" + } + if ($toolName -eq "p7zip-full") { $toolName = "p7zip" diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 597ebdd4d..fb135f0b4 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -158,6 +158,7 @@ "zsync" ], "cmd_packages": [ + "aria2", "binutils", "bison", "brotli", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index cf633b672..812d556a1 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -158,6 +158,7 @@ ], "cmd_packages": [ "acl", + "aria2", "binutils", "bison", "brotli",