GHA CI: re-use qt_modules and qt_archives lists for macOS and Linux (#2118)

* GHA CI: re-use qt_modules and qt_archives lists for macOS and Linux

Author: iakov

.github/workflows/setup_environment.yml

@@ -122,6 +122,8 @@ jobs:
           source ./buildScripts/github/install_linter.sh
           LEFT="${{ github.event.pull_request.base.sha || github.event.before }}"
           RIGHT="${{ github.event.pull_request.head.sha || github.event.after }}"
+          ${{ inputs.executor }} git fetch origin ${LEFT} --depth=1
+          ${{ inputs.executor }} git fetch origin ${RIGHT} --depth=1
           ${{ inputs.executor }} env COMMIT_RANGE="$LEFT...$RIGHT" buildScripts/github/vera_translation.sh
       env:
         TRIK_QT_VERSION: ${{ inputs.trik_qt_version }}

buildScripts/github/install.sh

@@ -6,7 +6,8 @@ XCODE_VERSION=${XCODE_VERSION:-15.3}
 SCRIPT_DIR="$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
 
 source "$SCRIPT_DIR/utilities.sh"
-
+qt_archives=("qtbase" "qtmultimedia" "qtsvg" "qtscript" "qttools" "qtserialport" "qtimageformats" "qtdeclarative" "qtquickcontrols2" "qttranslations")
+qt_modules=("qtscript")
 case "$(uname)" in
   Darwin)
     export HOMEBREW_NO_INSTALL_CLEANUP=1
@@ -18,8 +19,8 @@ case "$(uname)" in
       p="${pkg##*/}"
       p="${p%.*}"
       brew install --quiet "$pkg" || brew upgrade "$pkg" || brew link --force "$pkg" || echo "Failed to install/upgrade $pkg"
-    done
-    modules=("qtscript")
+    done    
+    qt_archives+=("qtmacextras")
 
     PYTHON_VERSION="3.${TRIK_PYTHON3_VERSION_MINOR}.$TRIK_PYTHON3_VERSION_PATCH"
     PYTHON_INSTALLER_NAME="python-$PYTHON_VERSION-macos11.pkg"
@@ -35,7 +36,7 @@ case "$(uname)" in
     sudo port selfupdate
     sudo port install libusb +universal
 
-    install_qt mac desktop "${TRIK_QT_VERSION}" "$HOME/Qt" $modules
+    install_qt mac desktop "${TRIK_QT_VERSION}" "$HOME/Qt" qt_modules qt_archives
     sudo xcode-select -s /Applications/Xcode_${XCODE_VERSION}.app/Contents/Developer
     xcodebuild -showsdks
     xcrun -sdk macosx --show-sdk-path
@@ -69,9 +70,9 @@ case "$(uname)" in
       else
         sudo yum install -y --setopt=install_weak_deps=False libX11-xcb libXext libxkbcommon-x11 fontconfig freetype libXrender
         #libQt5WaylandCompositor.so.5.15: libQt5Quick.so.5 libQt5Qml.so.5 libQt5QmlModels.so.5 
-        modules=("qtscript" "qtwaylandcompositor")
-        archives=("qtbase" "qtmultimedia" "qtsvg" "qtscript" "qttools" "qtserialport" "qtimageformats" "icu" "qtwayland" "qtdeclarative" "qtquickcontrols2" "qttranslations")
-        install_qt linux desktop "$TRIK_QT_VERSION" "$HOME/Qt" $modules $archives
+        qt_modules+=("qtwaylandcompositor")
+        qt_archives+=("icu" "qtwayland")
+        install_qt linux desktop "$TRIK_QT_VERSION" "$HOME/Qt" qt_modules qt_archives
         QT_ROOT_DIR=$(ls -1d "$HOME"/Qt/$TRIK_QT_VERSION*/gcc_64 | head -n 1)
         echo "$QT_ROOT_DIR/bin" >> $GITHUB_PATH
       fi

buildScripts/github/install_linter.sh

@@ -8,7 +8,7 @@ sudo apt-get update && sudo apt-get install -y --no-install-recommends vera++
 
 modules=("qtscript" "qtwaylandcompositor")
 archives=("qtbase" "qtmultimedia" "qtsvg" "qtscript" "qttools" "qtserialport" "qtimageformats" "icu" "qtwayland" "qtdeclarative" "qttranslations" "qtsvgwidgets" "qtxmlpatterns" "qtwebenginewidgets" "qtwebkit" "qtwebkitwidgets")
-install_qt linux desktop "$TRIK_QT_VERSION" "$HOME/Qt" $modules $archives
+install_qt linux desktop "$TRIK_QT_VERSION" "$HOME/Qt" modules archives
 QT_ROOT_DIR=$(ls -1d "$HOME"/Qt/$TRIK_QT_VERSION*/gcc_64 | head -n 1)
 echo "$QT_ROOT_DIR/bin" >> $GITHUB_PATH
 export PATH="$QT_ROOT_DIR/bin:$PATH"

buildScripts/github/utilities.sh

@@ -1,20 +1,45 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -euxo pipefail
 TRIK_PYTHON3_VERSION_MINOR=${TRIK_PYTHON3_VERSION_MINOR:-11}
 TRIK_PYTHON=python3.${TRIK_PYTHON3_VERSION_MINOR}
 
-install_qt(){
+get_array_by_name() {
+  # Bash expansion (works on 3.2+ for macOS too)
+
+  #Check for output var to be declared before call as an array
+  if ! declare -p get_array_by_name_result 2>/dev/null | grep -q ' -a '; then
+    echo "Error: 'get_array_by_name_result' variable must be declared as an array before calling get_array_by_name." >&2
+    return 1
+  fi
+  local name="${1:-}"
+  # Check that referenced by name one is defined as an array
+  if declare -p "$name" 2>/dev/null | grep -q ' -a '; then
+    local ref="${name}[@]"
+    get_array_by_name_result=("${!ref}")
+  else
+    get_array_by_name_result=()
+    echo "Error: '$name' is not a defined indexed array." >&2
+    return 1
+  fi
+}
+
+
+install_qt() {
   # Usage: install_qt <os> <platform-type> <qt-version> <path-to-install-qt> <modules> <archives>
   # TODO: add <addittional-options>
   "$TRIK_PYTHON" -m venv venv
   . ./venv/bin/activate
   "$TRIK_PYTHON" -m pip install -U pip
   "$TRIK_PYTHON" -m pip install aqtinstall
-  if [ -z "${6+x}" ]; then
-    "$TRIK_PYTHON" -m aqt install-qt "$1" "$2" "$3" -O "$4" -m "${modules[@]}"
-  else
-    "$TRIK_PYTHON" -m aqt install-qt "$1" "$2" "$3" -O "$4" -m "${modules[@]}" --archives "${archives[@]}"
-  fi
+  local -a cmd=("$TRIK_PYTHON" -m aqt install-qt "$1" "$2" "$3" -O "$4")
+
+
+  local -a get_array_by_name_result=() #declare before call
+  if [[ -n "$5:-" ]] ; then { get_array_by_name "${5}" || return 1 ; (( ${#get_array_by_name_result[@]} > 0 )) && cmd+=("-m" "${get_array_by_name_result[@]}") ; } ; fi
+  if [[ -n "$6:-" ]] ; then { get_array_by_name "${6}" || return 1 ; (( ${#get_array_by_name_result[@]} > 0 )) && cmd+=("--archives" "${get_array_by_name_result[@]}") ; } ; fi
+
+  "${cmd[@]}"
+
   if [ "$BUILD_INSTALLER" = "true" ]; then
     [ -d $HOME/qtifw ] || env TRIK_QTIFW_INSTALL_DIR="$HOME/qtifw" "$(dirname $(realpath ${BASH_SOURCE[0]}))"/install_qtifw.sh
   fi