preserve CI on ubuntu 18 in addition to adding ubuntu 20 and newer qmlfmt

Author: pestophagous

.github/workflows/basic_ci_ubuntu18.yml

@@ -0,0 +1,35 @@
+#
+# Copyright (c) 2020, 219 Design, LLC
+# See LICENSE.txt
+#
+# https://www.219design.com
+# Software | Electrical | Mechanical | Product Design
+#
+name: Linux_CI_Ubuntu18
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-18.04
+
+    steps:
+    - uses: actions/checkout@v1
+
+    # Remove apt repos that are known to break from time to time
+    # See https://github.com/actions/virtual-environments/issues/323
+    - name: Remove broken apt repos
+      run: |
+        for apt_file in `grep -lr microsoft /etc/apt/sources.list.d/`; do sudo rm $apt_file; done
+
+    - if: runner.os == 'Linux'
+      # Fix (another kind) of azure ubuntu apt repo issue. (Unable to connect to azure.archive.ubuntu.com)
+      run: sed -e 's/azure.archive.ubuntu.com/us.archive.ubuntu.com/g' -e t -e d /etc/apt/sources.list | sudo tee /etc/apt/sources.list.d/nonazure.list
+
+    - name: run_all_tests
+      env:
+        MYAPP_TEMPLATE_BUILD_ANDROID: 1
+        MYAPP_TEMPLATE_BUILD_APPIMAGE: 1
+        MYAPP_TEMPLATE_LEGACY_UBUNTU18: 1
+      run: ./run_all_tests.sh

cookiecutter/init_repo.sh

@@ -19,7 +19,9 @@ git add .
 
 git add -f AppImage_staging/.do_not_format
 git add -f dl_third_party/.do_not_format
-git add -f dl_third_party/Qt_desktop/6.2.2/clang_64/extrabin/macos/qmlfmt
+git add -f dl_third_party/Qt_desktop/5.15.0/clang_64/extrabin/macos/qmlfmt
+git add -f dl_third_party/Qt_desktop/5.15.0/gcc_64/extrabin/qmlfmt
+# git add -f dl_third_party/Qt_desktop/6.2.2/clang_64/extrabin/macos/qmlfmt # TODO(pestophagous)
 git add -f dl_third_party/Qt_desktop/6.2.2/gcc_64/extrabin/qmlfmt
 git add -f dl_third_party/Qt_desktop/5.15.0/ios/mkspecs/qconfig.pri
 git add -f dl_third_party/Qt_desktop/5.15.0/msvc2019_64/mkspecs/qconfig.pri

dl_third_party/Qt_desktop/5.15.0/gcc_64/extrabin/qmlfmt

@@ -54,10 +54,6 @@ else
 
     # we still need qt6 in order to execute qmlfmt.
     # https://github.com/miurahr/aqtinstall/issues/126 "Installing smaller subset of the libraries"
-    #python3 -m aqt install-qt --base "${QTMIRROR}" --outputdir $DL_FOLDER/Qt_desktop linux desktop 6.2.2 --archives \
-    # icu \
-    # qtbase \
-    # qt5compat
     python3 -m aqt install-qt --base "${QTMIRROR}" --outputdir $DL_FOLDER/Qt_desktop linux desktop 6.2.2 --modules \
      qt5compat
   fi

tools/ci/get_qt_libs.sh

@@ -29,12 +29,6 @@ else
    qtsvg \
    qttools
 
-  bash -x $CUR_GIT_ROOT/tools/ci/install-qt.sh \
-   --directory $DL_FOLDER/Qt_desktop \
-   --version 6.2.2 \
-   qtbase \
-   qt5compat
-
 fi
 
 if [ -d $DL_FOLDER/Qt_desktop/5.15.0/ios/bin ]; then

tools/ci/get_qt_libs_mac.sh

@@ -0,0 +1,15 @@
+#_use_file_paths_from_GIT_ROOT_and_with_no_whitespace
+#
+# Note: the QML files that are checked in have been formatted using a
+#   relatively up-to-date edition of qmlfmt. However, on our legacy
+#   builds we use an older qmlfmt, due to Ubuntu 18 not providing the
+#   needed GLibC version to execute the newer qmlfmt.
+#   When running the older qmlfmt, we have to ignore format violations
+#   on a few files that the newer qmlfmt prettifies BETTER nowadays.
+#   (In other words, the older qmlfmt complains about these files, even
+#   though now they look nicer than what the older qmlfmt can manage.)
+#
+src/app/imports.qml
+src/lib_app/qml/main.qml
+src/lib_app/qml/viewColorPalette.qml
+src/libstyles/imports/libstyles/Theme.qml

tools/formatters/enforce_qml_format.exclusions.legacy_qmlfmt

@@ -27,19 +27,28 @@ if [[ -n ${MYAPP_TEMPLATE_DL_FOLDER_OVERRIDE-} ]]; then
   DL_FOLDER=${MYAPP_TEMPLATE_DL_FOLDER_OVERRIDE}
 fi
 
+MY_QT_VERSION=6.2.2
+MY_FMT_EXTRAARGS="-i 2" # newer qmlfmt supports indent spaces count
+
+if [[ -n ${MYAPP_TEMPLATE_LEGACY_UBUNTU18-} ]]; then
+  MY_QT_VERSION=5.15.0
+  MY_FMT_EXTRAARGS=""
+  cp "${THISDIR}/enforce_qml_format.exclusions.legacy_qmlfmt" "${THISDIR}/enforce_qml_format.exclusions"
+fi
+
 if [[ "$OSTYPE" == "darwin"* ]]; then
-  qml_formatter="${DL_FOLDER}/Qt_desktop/6.2.2/clang_64/extrabin/macos/qmlfmt"
+  qml_formatter="${DL_FOLDER}/Qt_desktop/${MY_QT_VERSION}/clang_64/extrabin/macos/qmlfmt"
 else
-  export LD_LIBRARY_PATH="${DL_FOLDER}/Qt_desktop/6.2.2/gcc_64/lib"
-  qml_formatter="${DL_FOLDER}/Qt_desktop/6.2.2/gcc_64/extrabin/qmlfmt"
+  export LD_LIBRARY_PATH="${DL_FOLDER}/Qt_desktop/${MY_QT_VERSION}/gcc_64/lib"
+  qml_formatter="${DL_FOLDER}/Qt_desktop/${MY_QT_VERSION}/gcc_64/extrabin/qmlfmt"
 fi
 
 check_format() {
   if [ $only_report != 0 ]; then
       while read filenames; do
         for fl in "$filenames"; do
           echo checking format of "$fl"
-          result=$("$qml_formatter" -l "$fl" -i 2)
+          result=$("$qml_formatter" -l "$fl" ${MY_FMT_EXTRAARGS})
           if [[ ! -z "$result" ]]; then
               # https://stackoverflow.com/a/34066473/10278 (find string in bash array)
               if echo ${the_exclusions[@]} | grep -q -w "$fl"; then
@@ -65,7 +74,7 @@ check_format() {
       if echo ${the_exclusions[@]} | grep -q -w "$fl"; then
         echo "INTENTIONAL EXLUSION OF $fl"
       else
-        "$qml_formatter" -w "$fl" -i 2
+        "$qml_formatter" -w "$fl" ${MY_FMT_EXTRAARGS}
       fi
     done
   done