ci: dependency updates

+--no-install-recommends +parallel +unzip Signed-off-by: Vitor Bandeira <[email protected]>
vvbandeira · Jul 8, 2024 · de5f98c · de5f98c
1 parent 3dd87fb
commit de5f98c
Showing 1 changed file with 20 additions and 20 deletions.
diff --git a/etc/DependencyInstaller.sh b/etc/DependencyInstaller.sh
@@ -249,8 +249,8 @@ _installUbuntuCleanUp() {
 _installUbuntuPackages() {
     export DEBIAN_FRONTEND="noninteractive"
     apt-get -y update
-    apt-get -y install tzdata
-    apt-get -y install \
+    apt-get -y install --no-install-recommends tzdata
+    apt-get -y install --no-install-recommends \
         automake \
         autotools-dev \
         binutils \
@@ -284,23 +284,23 @@ _installUbuntuPackages() {
         ccache \
 
     if _versionCompare $1 -ge 22.10; then
-        apt-get install -y \
+        apt-get install -y --no-install-recommends \
             libpython3.11 \
             qt5-qmake \
             qtbase5-dev \
             qtbase5-dev-tools \
             libqt5charts5-dev \
             qtchooser
     elif [[ $1 == 22.04 ]]; then
-        apt-get install -y \
+        apt-get install -y --no-install-recommends \
             libpython3.8 \
             qt5-qmake \
             qtbase5-dev \
             qtbase5-dev-tools \
             libqt5charts5-dev \
             qtchooser
     else
-        apt-get install -y \
+        apt-get install -y --no-install-recommends \
             libpython3.8 \
             libqt5charts5-dev \
             qt5-default
@@ -531,8 +531,8 @@ _installDebianCleanUp() {
 _installDebianPackages() {
     export DEBIAN_FRONTEND="noninteractive"
     apt-get -y update
-    apt-get -y install tzdata
-    apt-get -y install \
+    apt-get -y install --no-install-recommends tzdata
+    apt-get -y install --no-install-recommends \
         automake \
         autotools-dev \
         binutils \
@@ -563,11 +563,11 @@ _installDebianPackages() {
         zlib1g-dev
 
     if [[ $1 == 10 ]]; then
-        apt-get install -y \
+        apt-get install -y --no-install-recommends \
             libpython3.7 \
             qt5-default
     else
-        apt-get install -y \
+        apt-get install -y --no-install-recommends \
             libpython3.8 \
             qtbase5-dev \
             qtchooser \
@@ -578,22 +578,22 @@ _installDebianPackages() {
 
 _installCI() {
     apt-get -y update
-
-    #docker
-    apt install -y \
+    apt-get -y install --no-install-recommends \
         apt-transport-https \
         ca-certificates \
         curl \
-        software-properties-common
-    # apt-get -y install ca-certificates curl
-    # install -m 0755 -d /etc/apt/keyrings
+        software-properties-common \
+        parallel \
+        unzip
     curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
-
     echo \
     "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \
     $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
     apt-get -y update
-    apt-get -y install docker-ce docker-ce-cli containerd.io
+    apt-get -y install --no-install-recommends \
+        containerd.io \
+        docker-ce \
+        docker-ce-cli
 }
 
 _checkIsLocal() {
@@ -749,6 +749,9 @@ EOF
         ;;
     "Ubuntu" )
         version=$(awk -F= '/^VERSION_ID/{print $2}' /etc/os-release | sed 's/"//g')
+        if [[ ${CI} == "yes" ]]; then
+            _installCI
+        fi
         if [[ "${option}" == "base" || "${option}" == "all" ]]; then
             _checkIsLocal
             _installUbuntuPackages "${version}"
@@ -761,9 +764,6 @@ EOF
             fi
             _installOrTools "ubuntu" "${version}" "amd64"
         fi
-        if [[ ${CI} == "yes" ]]; then
-            _installCI
-        fi
         ;;
     "Red Hat Enterprise Linux")
         if [[ ${CI} == "yes" ]]; then