Merge pull request #545 from openstudiocoalition/develop

Merge to master for 1.4.0
openstudiocoalition · Jun 8, 2022 · e0fb8f8 · e0fb8f8
2 parents 3cc18af + f36960c
commit e0fb8f8
Show file tree

Hide file tree

Showing 626 changed files with 26,107 additions and 1,781 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -259,3 +259,12 @@ abcabd4cb0a2144b81e74212b19cc2dde1f04797
 
 # [chore] clang format + gitblame ignore rev [Julien Marrec, 2021-10-29]
 0778b866505cf35b8097597152cce71e5817ef28
+
+# clang format + using directives in FieldMethodTypeDefs [chore] [Julien Marrec, 2022-05-05]
+3259b8018969f708cba9791485267b49242307ca
+
+# Bump copyright [chore] [Julien Marrec, 2022-05-09]
+fd8be868ee9c5daae25299c49cb5c6e26aadce10
+
+# Bump copyright in extra files [chore] [Julien Marrec, 2022-05-09]
+626f67789419b0a44b4f911b4d95696889603af3
diff --git a/.github/workflows/app_build.yml b/.github/workflows/app_build.yml
@@ -28,36 +28,22 @@ env:
   CPACK_SOURCE_TXZ: OFF
   CPACK_SOURCE_TZ: OFF
   CPACK_SOURCE_ZIP: OFF
-  QT_VERSION: 5.15.0
+  QT_VERSION: 6.3.0
   # CPACK_BINARY_DEB: OS-SPECIFIC
   # CPACK_BINARY_IFW: OS-SPECIFIC
 
 jobs:
   build:
     # Note: as of 2021-01-29, this only works for push, not for pull request
     # if: "!(contains(github.event.head_commit.message, 'skip') && contains(github.event.head_commit.message, 'ci'))"
-    # runs-on: ubuntu-18.04
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.allow_failure }}
     strategy:
       # fail-fast: Default is true, switch to false to allow one platform to fail and still run others
       fail-fast: false
       matrix:
-        os: [ubuntu-18.04, ubuntu-20.04, windows-2019, macos-10.15]
+        os: [ubuntu-20.04, windows-2019, macos-10.15]
         include:
-        - os: ubuntu-18.04
-          allow_failure: false
-          PLATFORM_NAME: Linux
-          CPACK_BINARY_DEB: ON
-          CPACK_BINARY_IFW: OFF
-          CPACK_BINARY_TGZ: ON
-          CPACK_BINARY_ZIP: OFF
-          BINARY_EXT: deb
-          COMPRESSED_EXT: tar.gz
-          BINARY_PKG_PATH: _CPack_Packages/Linux/DEB
-          COMPRESSED_PKG_PATH: _CPack_Packages/Linux/TGZ
-          QT_OS_NAME: linux
-          QT_ARCH: gcc_64
         - os: ubuntu-20.04
           allow_failure: true
           PLATFORM_NAME: Linux
@@ -242,13 +228,18 @@ jobs:
         if [ "$RUNNER_OS" == "Linux" ]; then
           echo "Install needed system dependencies for OPENGL (due to Qt) for Linux"
           sudo apt update
-          sudo apt install -y mesa-common-dev libglu1-mesa-dev patchelf ninja-build
+          sudo apt install -y mesa-common-dev libglu1-mesa-dev patchelf ninja-build libxkbcommon-x11-dev libgl1-mesa-dev
+
           # Weirdly enough, ninja makes ubuntu unresponsive...
           echo CMAKE_GENERATOR='Ninja' >> $GITHUB_ENV
+
+          gcc --version
+
         elif [ "$RUNNER_OS" == "Windows" ]; then
-          curl -L -O https://download.qt.io/official_releases/qt-installer-framework/4.0.1/QtInstallerFramework-win-x86.exe
-          ./QtInstallerFramework-win-x86.exe --verbose --script ./ci/install_script_qtifw.qs
-          echo "C:/Qt/QtIFW-4.0.1/bin" >> $GITHUB_PATH
+          curl -L -O https://download.qt.io/official_releases/qt-installer-framework/4.3.0/QtInstallerFramework-windows-x86-4.3.0.exe
+          ./QtInstallerFramework-windows-x86-4.3.0.exe --verbose --script ./ci/install_script_qtifw.qs
+          dir "C:/Qt/"
+          echo "C:/Qt/QtIFW-4.3.0/bin" >> $GITHUB_PATH
 
           echo "Using chocolatey to install ninja"
           choco install ninja
@@ -270,18 +261,24 @@ jobs:
 
           brew install md5sha1sum
 
-          curl -L -O https://download.qt.io/official_releases/qt-installer-framework/4.0.1/QtInstallerFramework-mac-x64.dmg
-          hdiutil attach -mountpoint ./qtfiw_installer QtInstallerFramework-mac-x64.dmg
+          curl -L -O https://download.qt.io/official_releases/qt-installer-framework/4.3.0/QtInstallerFramework-macOS-x64-4.3.0.dmg
+          hdiutil attach -mountpoint ./qtfiw_installer QtInstallerFramework-macOS-x64-4.3.0.dmg
           echo "ls ./qtfiw_installer"
           ls ./qtfiw_installer
-          echo "ls ./qtfiw_installer/QtInstallerFramework-mac-x64.app/"
-          echo "ls ./qtfiw_installer/QtInstallerFramework-mac-x64.app/Contents/"
-          echo "ls ./qtfiw_installer/QtInstallerFramework-mac-x64.app/Contents/MacOS"
-          echo "ls ./qtfiw_installer/QtInstallerFramework-mac-x64.app/Contents/Resources"
-          echo "ls ./qtfiw_installer/QtInstallerFramework-mac-x64.app/Contents/Frameworks"
-
-          sudo ./qtfiw_installer/QtInstallerFramework-mac-x64.app/Contents/MacOS/QtInstallerFramework-mac-x64 --verbose --script ./ci/install_script_qtifw.qs
-          echo "~/Qt/QtIFW-4.0.1/bin/" >> $GITHUB_PATH
+          echo "ls ./qtfiw_installer/QtInstallerFramework-macOS-x64-4.3.0.app/"
+          ls ./qtfiw_installer/QtInstallerFramework-macOS-x64-4.3.0.app/
+          echo "ls ./qtfiw_installer/QtInstallerFramework-macOS-x64-4.3.0.app/Contents/"
+          ls ./qtfiw_installer/QtInstallerFramework-macOS-x64-4.3.0.app/Contents/
+          echo "ls ./qtfiw_installer/QtInstallerFramework-macOS-x64-4.3.0.app/Contents/MacOS"
+          ls ./qtfiw_installer/QtInstallerFramework-macOS-x64-4.3.0.app/Contents/MacOS
+          echo "ls ./qtfiw_installer/QtInstallerFramework-macOS-x64-4.3.0.app/Contents/Resources"
+          ls ./qtfiw_installer/QtInstallerFramework-macOS-x64-4.3.0.app/Contents/Resources
+
+          sudo ./qtfiw_installer/QtInstallerFramework-macOS-x64-4.3.0.app/Contents/MacOS/QtInstallerFramework-macOS-x64-4.3.0 --verbose --script ./ci/install_script_qtifw.qs
+          ls ~
+          ls ~/Qt/ || true
+          ls ~/Qt/QtIFW-4.3.0 || true
+          echo "~/Qt/QtIFW-4.3.0/bin/" >> $GITHUB_PATH
         fi;
 
         CONAN_INSTALL_MD5=$(md5sum ConanInstall.cmake | awk '{print $1}')
@@ -295,7 +292,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: build/
-        key: ${{ matrix.os }}-build-cache-${{ secrets.CACHE_KEY }}
+        key: ${{ matrix.os }}-build-cache-v1-${{ secrets.CACHE_KEY }}
 
     - name: Did restoring the build-cache work? No
       # If the build cache wasn't found in the cache
@@ -418,24 +415,31 @@ jobs:
         if [ "$RUNNER_OS" == "Windows" ]; then
           # QT_INSTALL_DIR="$(pwd)/build/Qt-install/$QT_VERSION/msvc2019_64"
           QT_INSTALL_DIR="$(cmd.exe /c 'cd')\build\Qt-install\${{ env.QT_VERSION }}\msvc2019_64"
+        elif [ "$RUNNER_OS" == "macOS" ]; then
+          QT_INSTALL_DIR="$(pwd)/build/Qt-install/$QT_VERSION/macos"
         else
           QT_INSTALL_DIR="$(pwd)/build/Qt-install/$QT_VERSION/${{ matrix.QT_ARCH }}"
         fi
+        rm -rf $QT_INSTALL_DIR
         if [ -d "$QT_INSTALL_DIR" ]; then
           echo "Qt $QT_VERSION already installed"
         else
           echo "Install aqtinstall, then install Qt $QT_VERSION for ${{ matrix.QT_OS_NAME }} ${{ matrix.QT_ARCH }}"
           pip3 install aqtinstall
-          aqt install --outputdir ./build/Qt-install/ $QT_VERSION ${{ matrix.QT_OS_NAME }} desktop ${{ matrix.QT_ARCH }} -m qtwebengine qtwebglplugin
+          aqt install-qt --outputdir ./build/Qt-install/ ${{ matrix.QT_OS_NAME }} desktop $QT_VERSION ${{ matrix.QT_ARCH }} -m qtwebchannel qtwebengine qtwebview qt5compat qtpositioning
         fi
 
         echo "$QT_INSTALL_DIR/bin" >> $GITHUB_PATH
         echo QT_INSTALL_DIR=$QT_INSTALL_DIR >> $GITHUB_ENV
-        ls ./build/Qt-install/$QT_VERSION/
-        ls $QT_INSTALL_DIR || true
-        ls $QT_INSTALL_DIR/lib || true
-        ls $QT_INSTALL_DIR/lib/cmake || true
+        #ls ./build/Qt-install/$QT_VERSION/
+        #ls $QT_INSTALL_DIR || true
+        #ls $QT_INSTALL_DIR/lib || true
+        #ls $QT_INSTALL_DIR/lib/cmake || true
         find ./build/Qt-install -name "*.cmake"
+        #ls $QT_INSTALL_DIR/translations || true
+        #ls $QT_INSTALL_DIR/translations/qtwebengine_locales || true
+        find ./build/Qt-install . -name "*.qm"
+        find ./build/Qt-install . -name "*.pak"
 
     #- name: Cache Qt dep cache?
       ## To avoid downloading the Qt dependency all the time, we try to cache it

diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
@@ -1,5 +1,7 @@
 name: "CLA Assistant"
 on:
+  issue_comment:
+    types: [created]
   pull_request_target:
     types: [opened,closed,synchronize]
 

diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml
@@ -32,7 +32,6 @@ jobs:
       shell: bash
       run: |
           cppcheck \
-            --suppress=noExplicitConstructor \
             --suppress=useStlAlgorithm \
             --inline-suppr \
             --inconclusive \