Qt : Bump build version to 5.12.12 (#8544)

* Qt : Bump build version to 5.12.12

* Bump cache key

.github/workflows/AppFwkUnitTest.yml

@@ -11,38 +11,44 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+
       - name: Cache Qt
         id: cache-qt
         uses: actions/cache@v2
         with:
           path: ${{ github.workspace }}/Qt/
-          key: ${{ runner.os }}-QtCache
+          key: ${{ runner.os }}-QtCache-5-12-12
+
       - name: Install Qt
         uses: jurplel/install-qt-action@v2
         with:
-          version: 5.9.9
-          modules: qtscript 
-          dir: '${{ github.workspace }}/Qt/'
+          version: 5.12.12
+          modules: qtscript
+          dir: "${{ github.workspace }}/Qt/"
           cached: ${{ steps.cache-qt.outputs.cache-hit }}
+
       - name: Install Linux dependencies
         if: "contains( matrix.os, 'ubuntu')"
         run: sudo apt-get install libxkbcommon-x11-0 libgl1-mesa-dev mesa-common-dev libglfw3-dev libglu1-mesa-dev
+
       - name: Build AppFwk with Unit Tests
         uses: lukka/run-cmake@v1
         with:
           cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
-          cmakeListsTxtPath: '${{ github.workspace }}/Fwk/AppFwk/CMakeLists.txt'
-          cmakeAppendedArgs:  
+          cmakeListsTxtPath: "${{ github.workspace }}/Fwk/AppFwk/CMakeLists.txt"
+          cmakeAppendedArgs:
           buildDirectory: ${{ github.workspace }}/cmakebuild
-          buildWithCMakeArgs: '--config Release'
+          buildWithCMakeArgs: "--config Release"
           useVcpkgToolchainFile: false
+
       - name: Run Unit Tests Windows
-        if: contains( matrix.os, 'windows')  
+        if: contains( matrix.os, 'windows')
         shell: bash
         run: |
           cmakebuild/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/Release/cafPdmCore_UnitTests
           cmakebuild/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/Release/cafPdmXml_UnitTests
           cmakebuild/cafProjectDataModel/cafProjectDataModel_UnitTests/Release/cafProjectDataModel_UnitTests
+
       - name: Run Unit Tests Linux
         if: "!contains( matrix.os, 'windows')"
         shell: bash
@@ -50,4 +56,3 @@ jobs:
           cmakebuild/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmCore_UnitTests
           cmakebuild/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/cafPdmXml_UnitTests
           cmakebuild/cafProjectDataModel/cafProjectDataModel_UnitTests/cafProjectDataModel_UnitTests
-          

.github/workflows/ResInsightWithCache.yml

@@ -5,11 +5,11 @@ on:
   pull_request:
   schedule:
     # Every day at 1am to make sure we have a build cache for the current date
-    # build cache is   
-    - cron: '0 1 * * * '
+    # build cache is
+    - cron: "0 1 * * * "
 env:
   BUILD_TYPE: Release
-  BUILDCACHE_VERSION: 0.24.4
+  BUILDCACHE_VERSION: 0.27.6
   BUILDCACHE_DIR: ${{ github.workspace }}/buildcache_dir
   BUILDCACHE_ACCURACY: SLOPPY
 
@@ -20,57 +20,62 @@ jobs:
       fail-fast: false
       matrix:
         config:
-        - {
-            name: "Windows Latest MSVC",
-            os: windows-latest,
-            cc: "cl", cxx: "cl",
-            vcpkg-response-file: vcpkg_x64-windows.txt,
-            vcpkg-triplet: x64-windows,
-            build-python-module: true,
-            execute-unit-tests: true
-          }
-        - {
-            name: "Ubuntu Latest gcc",
-            os: ubuntu-latest,
-            cc: "gcc", cxx: "g++",
-            vcpkg-response-file: vcpkg_x64-linux.txt,
-            vcpkg-triplet: x64-linux,
-            build-python-module: true,
-            execute-unit-tests: true
-          }
-        - {
-            name: "Ubuntu Latest clang",
-            os: ubuntu-latest,
-            cc: "clang", cxx: "clang++",
-            vcpkg-response-file: vcpkg_x64-linux.txt,
-            vcpkg-triplet: x64-linux,
-            build-python-module: true,
-            execute-unit-tests: true
-          }
-        - {
-            name: "Mac OS",
-            os: macos-latest,
-            cc: "clang", cxx: "clang++",
-            vcpkg-response-file: vcpkg_x64-osx.txt,
-            vcpkg-triplet: x64-osx,
-            build-python-module: false,
-            execute-unit-tests: false
-          }
+          - {
+              name: "Windows Latest MSVC",
+              os: windows-latest,
+              cc: "cl",
+              cxx: "cl",
+              vcpkg-response-file: vcpkg_x64-windows.txt,
+              vcpkg-triplet: x64-windows,
+              build-python-module: true,
+              execute-unit-tests: true,
+            }
+          - {
+              name: "Ubuntu Latest gcc",
+              os: ubuntu-latest,
+              cc: "gcc",
+              cxx: "g++",
+              vcpkg-response-file: vcpkg_x64-linux.txt,
+              vcpkg-triplet: x64-linux,
+              build-python-module: true,
+              execute-unit-tests: true,
+            }
+          - {
+              name: "Ubuntu Latest clang",
+              os: ubuntu-latest,
+              cc: "clang",
+              cxx: "clang++",
+              vcpkg-response-file: vcpkg_x64-linux.txt,
+              vcpkg-triplet: x64-linux,
+              build-python-module: true,
+              execute-unit-tests: true,
+            }
+          - {
+              name: "Mac OS",
+              os: macos-latest,
+              cc: "clang",
+              cxx: "clang++",
+              vcpkg-response-file: vcpkg_x64-osx.txt,
+              vcpkg-triplet: x64-osx,
+              build-python-module: false,
+              execute-unit-tests: false,
+            }
     steps:
       - name: Checkout
         uses: actions/checkout@v2
         with:
           submodules: true
+
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: '3.8'
+          python-version: "3.8"
       - name: Display Python version
         run: python -c "import sys; print(sys.version)"
-      
+
       - name: Use CMake
         uses: lukka/get-cmake@latest
-        
+
       - name: Use MSVC (Windows)
         if: matrix.config.os == 'windows-latest'
         uses: ilammy/msvc-dev-cmd@v1
@@ -80,7 +85,7 @@ jobs:
         shell: cmake -P {0}
         run: |
           if ("${{ runner.os }}" STREQUAL "Windows")
-            set(buildcache_suffix "win-msvc.zip")
+            set(buildcache_suffix "windows.zip")
           elseif ("${{ runner.os }}" STREQUAL "macOS")
             set(buildcache_suffix "macos.zip")
           elseif ("${{ runner.os }}" STREQUAL "Linux")
@@ -97,7 +102,7 @@ jobs:
               COMMAND chmod +x buildcache/bin/buildcache
             )
           endif()
-          
+
       - name: Prepare cache timestamp
         id: cache_timestamp_string
         shell: cmake -P {0}
@@ -111,28 +116,30 @@ jobs:
           path: ${{ env.BUILDCACHE_DIR }}
           key: ${{ matrix.config.os }}-${{ matrix.config.cc }}-cache-v02-${{ steps.cache_timestamp_string.outputs.timestamp }}
       - name: Create Folder for buildcache
-        run: New-Item ${{ env.BUILDCACHE_DIR }} -ItemType "directory" -Force 
+        run: New-Item ${{ env.BUILDCACHE_DIR }} -ItemType "directory" -Force
         shell: pwsh
       - name: Add buildcache to system path
         run: echo "${{github.workspace}}/buildcache/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8
         shell: pwsh
-        
-      - name: Cache Qt        
+
+      - name: Cache Qt
         id: cache-qt
         uses: actions/cache@v2
         with:
           path: ${{ github.workspace }}/Qt/
-          key: ${{ matrix.config.os }}-QtCache-v03
+          key: ${{ matrix.config.os }}-QtCache-5-12-12
       - name: Install Qt
         uses: jurplel/install-qt-action@v2
         with:
-          version: 5.9.9
+          version: 5.12.12
           modules: qtscript qtcharts
-          dir: '${{ github.workspace }}/Qt/'
+          dir: "${{ github.workspace }}/Qt/"
           cached: ${{ steps.cache-qt.outputs.cache-hit }}
+
       - name: Install Linux dependencies
         if: "contains( matrix.config.os, 'ubuntu')"
         run: sudo apt-get install libxkbcommon-x11-0 libgl1-mesa-dev mesa-common-dev libglfw3-dev libglu1-mesa-dev libhdf5-dev
+
       - name: Get Python executable path
         id: python-path
         run: echo "::set-output name=PYTHON_EXECUTABLE::$(python -c 'import sys; import pathlib; print (pathlib.PurePath(sys.executable).as_posix())')"
@@ -147,9 +154,10 @@ jobs:
         uses: lukka/run-vcpkg@v7
         id: runvcpkg
         with:
-          vcpkgArguments: '@${{ github.workspace }}/${{ matrix.config.vcpkg-response-file }}'
-          vcpkgDirectory: '${{ github.workspace }}/ThirdParty/vcpkg'
-           # Ensure the cache key changes any time the content of the response file changes.
+          vcpkgArguments: "@${{ github.workspace }}/${{ matrix.config.vcpkg-response-file }}"
+          vcpkgDirectory:
+            "${{ github.workspace }}/ThirdParty/vcpkg"
+            # Ensure the cache key changes any time the content of the response file changes.
           appendedCacheKey: ${{ hashFiles(env.VCPKGRESPONSEFILE) }}-cache-key-v2
 
       - name: Cache dynamic version of OpenSSL (Linux)
@@ -169,7 +177,7 @@ jobs:
         run: |
           set(ENV{CC} ${{ matrix.config.cc }})
           set(ENV{CXX} ${{ matrix.config.cxx }})
-          
+
           execute_process(
             COMMAND cmake
               -S .

.github/workflows/ResInsightWithCacheManualPaths.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   schedule:
     # Once every night
-    - cron: '0 1 * * * '
+    - cron: "0 1 * * * "
 env:
   NINJA_VERSION: 1.9.0
   BUILD_TYPE: Release
@@ -18,14 +18,15 @@ jobs:
       fail-fast: false
       matrix:
         config:
-        - {
-            name: "Ubuntu 20.04",
-            os: ubuntu-20.04,
-            cc: "gcc", cxx: "g++",
-            vcpkg-response-file: vcpkg_x64-linux.txt,
-            vcpkg-triplet: x64-linux,
-            cmake-toolchain: 'ThirdParty/vcpkg/scripts/buildsystems/vcpkg.cmake'
-          }
+          - {
+              name: "Ubuntu 20.04",
+              os: ubuntu-20.04,
+              cc: "gcc",
+              cxx: "g++",
+              vcpkg-response-file: vcpkg_x64-linux.txt,
+              vcpkg-triplet: x64-linux,
+              cmake-toolchain: "ThirdParty/vcpkg/scripts/buildsystems/vcpkg.cmake",
+            }
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -34,7 +35,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: '3.8'
+          python-version: "3.8"
       - name: Display Python version
         run: python -c "import sys; print(sys.version)"
       - name: Download Ninja
@@ -61,7 +62,7 @@ jobs:
               COMMAND chmod +x buildcache/bin/buildcache
             )
           endif()
-          
+
       - name: Prepare cache timestamp
         id: cache_timestamp_string
         shell: cmake -P {0}
@@ -75,24 +76,24 @@ jobs:
           path: ${{ env.BUILDCACHE_DIR }}
           key: ${{ matrix.config.name }}-cache-v02-${{ steps.cache_timestamp_string.outputs.timestamp }}
       - name: Create Folder for buildcache
-        run: New-Item ${{ env.BUILDCACHE_DIR }} -ItemType "directory" -Force 
+        run: New-Item ${{ env.BUILDCACHE_DIR }} -ItemType "directory" -Force
         shell: pwsh
       - name: Add buildcache to system path
         run: echo "${{github.workspace}}/buildcache/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8
         shell: pwsh
-        
-      - name: Cache Qt        
+
+      - name: Cache Qt
         id: cache-qt
         uses: actions/cache@v2
         with:
           path: ${{ github.workspace }}/Qt/
-          key: ${{ matrix.config.os }}-QtCache-v03
+          key: ${{ matrix.config.os }}-QtCache-5-12-12
       - name: Install Qt
         uses: jurplel/install-qt-action@v2
         with:
-          version: 5.9.9
+          version: 5.12.12
           modules: qtscript qtcharts
-          dir: '${{ github.workspace }}/Qt/'
+          dir: "${{ github.workspace }}/Qt/"
           cached: ${{ steps.cache-qt.outputs.cache-hit }}
       - name: Install Linux dependencies
         if: "contains( matrix.config.os, 'ubuntu')"
@@ -111,9 +112,10 @@ jobs:
         uses: lukka/run-vcpkg@v5
         id: runvcpkg
         with:
-          vcpkgArguments: '@${{ github.workspace }}/${{ matrix.config.vcpkg-response-file }}'
-          vcpkgDirectory: '${{ github.workspace }}/ThirdParty/vcpkg'
-           # Ensure the cache key changes any time the content of the response file changes.
+          vcpkgArguments: "@${{ github.workspace }}/${{ matrix.config.vcpkg-response-file }}"
+          vcpkgDirectory:
+            "${{ github.workspace }}/ThirdParty/vcpkg"
+            # Ensure the cache key changes any time the content of the response file changes.
           appendedCacheKey: ${{ hashFiles(env.VCPKGRESPONSEFILE) }}
 
       - name: Configure
@@ -138,7 +140,7 @@ jobs:
             set(path_separator ";")
           endif()
           set(ENV{PATH} "$ENV{GITHUB_WORKSPACE}${path_separator}$ENV{PATH}")
-          
+
           execute_process(
             COMMAND cmake
               -S .

.github/workflows/centos7.yml

@@ -4,93 +4,93 @@ on:
   workflow_dispatch:
   schedule:
     # Once every night
-    - cron: '0 1 * * * '
+    - cron: "0 1 * * * "
 jobs:
   build_on_centos7:
     runs-on: ubuntu-latest
     container:
       image: centos:7
     steps:
-    - name: Install Dependencies
-      run: | 
-        yum install -y centos-release-scl
-        yum-config-manager --enable rhel-server-rhscl-7-rpms
-      
-        yum install -y https://repo.ius.io/ius-release-el7.rpm
-        yum install -y git222
+      - name: Install Dependencies
+        run: |
+          yum install -y centos-release-scl
+          yum-config-manager --enable rhel-server-rhscl-7-rpms
 
-        yum install -y qt5-qtbase
-        yum install -y qt5-qtbase-devel
-        yum install -y qt5-qtscript-devel
-        yum install -y qt5-qtsvg-devel
+          yum install -y https://repo.ius.io/ius-release-el7.rpm
+          yum install -y git222
 
-        yum install -y cmake3
-        yum install -y make
+          yum install -y qt5-qtbase
+          yum install -y qt5-qtbase-devel
+          yum install -y qt5-qtscript-devel
+          yum install -y qt5-qtsvg-devel
 
-        yum install -y mesa-libGL-devel
-        yum install -y freeglut-devel
+          yum install -y cmake3
+          yum install -y make
 
-        yum install -y devtoolset-10
-        
-        yum install -y rh-python36
-    - name: Build QtCharts
-      run: |
-        source /opt/rh/devtoolset-10/enable
-        git clone git://code.qt.io/qt/qtcharts.git
-        cd qtcharts/
-        git checkout v5.9.7
-        qmake-qt5 --version
-        qmake-qt5 -makefile
-        make -j 4
-        make install
-    - name: Checkout
-      uses: actions/checkout@v2
-      with:
-        submodules: true
-    - name: Set up Python
-      id: python-path
-      run: |
-        source /opt/rh/rh-python36/enable
-        python -c "import sys; print(sys.version)"
-        echo "::set-output name=PYTHON_EXECUTABLE::$(python -c 'import sys; import pathlib; print (pathlib.PurePath(sys.executable).as_posix())')"
-    - name: Build ResInsight
-      run: |
-        source /opt/rh/devtoolset-10/enable
-        source /opt/rh/rh-python36/enable
+          yum install -y mesa-libGL-devel
+          yum install -y freeglut-devel
 
-        cmake3 --version
-        git --version
-        g++ --version
-        ${{ steps.python-path.outputs.PYTHON_EXECUTABLE }} --version
+          yum install -y devtoolset-10
 
-        ${{ steps.python-path.outputs.PYTHON_EXECUTABLE }} -m pip install --upgrade pip
-        ${{ steps.python-path.outputs.PYTHON_EXECUTABLE }} -m pip install grpcio-tools
+          yum install -y rh-python36
+      - name: Build QtCharts
+        run: |
+          source /opt/rh/devtoolset-10/enable
+          git clone git://code.qt.io/qt/qtcharts.git
+          cd qtcharts/
+          git checkout v5.12.12
+          qmake-qt5 --version
+          qmake-qt5 -makefile
+          make -j 4
+          make install
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+      - name: Set up Python
+        id: python-path
+        run: |
+          source /opt/rh/rh-python36/enable
+          python -c "import sys; print(sys.version)"
+          echo "::set-output name=PYTHON_EXECUTABLE::$(python -c 'import sys; import pathlib; print (pathlib.PurePath(sys.executable).as_posix())')"
+      - name: Build ResInsight
+        run: |
+          source /opt/rh/devtoolset-10/enable
+          source /opt/rh/rh-python36/enable
 
-        ThirdParty/vcpkg/bootstrap-vcpkg.sh 
-        ThirdParty/vcpkg/vcpkg install grpc boost-filesystem boost-spirit eigen3
-        
-        mkdir cmakebuild
-        cd cmakebuild
-        cmake3 \
-        -DRESINSIGHT_QT5_BUNDLE_LIBRARIES=ON \
-        -DRESINSIGHT_ENABLE_GRPC=true \
-        -DRESINSIGHT_ENABLE_UNITY_BUILD=true \
-        -DVCPKG_TARGET_TRIPLET=x64-linux \
-        -DCMAKE_TOOLCHAIN_FILE=../ThirdParty/vcpkg/scripts/buildsystems/vcpkg.cmake \
-        -DRESINSIGHT_GRPC_PYTHON_EXECUTABLE=${{ steps.python-path.outputs.PYTHON_EXECUTABLE }} \
-        -DRESINSIGHT_GRPC_DOWNLOAD_PYTHON_MODULE=true \
-        ..
-        
-        make -j8
-        make package
-        rm -rf packages/_CPack_Packages
-        
-        # Show file structure
-        pwd
-        ls
+          cmake3 --version
+          git --version
+          g++ --version
+          ${{ steps.python-path.outputs.PYTHON_EXECUTABLE }} --version
 
-    - name: Upload artifact
-      uses: actions/upload-artifact@v2
-      with:
-        name: ResInsight
-        path: ./cmakebuild/packages
+          ${{ steps.python-path.outputs.PYTHON_EXECUTABLE }} -m pip install --upgrade pip
+          ${{ steps.python-path.outputs.PYTHON_EXECUTABLE }} -m pip install grpcio-tools
+
+          ThirdParty/vcpkg/bootstrap-vcpkg.sh 
+          ThirdParty/vcpkg/vcpkg install grpc boost-filesystem boost-spirit eigen3
+
+          mkdir cmakebuild
+          cd cmakebuild
+          cmake3 \
+          -DRESINSIGHT_QT5_BUNDLE_LIBRARIES=ON \
+          -DRESINSIGHT_ENABLE_GRPC=true \
+          -DRESINSIGHT_ENABLE_UNITY_BUILD=true \
+          -DVCPKG_TARGET_TRIPLET=x64-linux \
+          -DCMAKE_TOOLCHAIN_FILE=../ThirdParty/vcpkg/scripts/buildsystems/vcpkg.cmake \
+          -DRESINSIGHT_GRPC_PYTHON_EXECUTABLE=${{ steps.python-path.outputs.PYTHON_EXECUTABLE }} \
+          -DRESINSIGHT_GRPC_DOWNLOAD_PYTHON_MODULE=true \
+          ..
+
+          make -j8
+          make package
+          rm -rf packages/_CPack_Packages
+
+          # Show file structure
+          pwd
+          ls
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: ResInsight
+          path: ./cmakebuild/packages