Merge pull request #8230 from OPM/dev

Release 2021.10.0

.github/workflows/ResInsightWithCache.yml

@@ -8,7 +8,6 @@ on:
     # build cache is 
     - cron: '0 1 * * * '
 env:
-  NINJA_VERSION: 1.9.0
   BUILD_TYPE: Release
   BUILDCACHE_VERSION: 0.24.4
   BUILDCACHE_DIR: ${{ github.workspace }}/buildcache_dir
@@ -73,10 +72,11 @@ jobs:
           python-version: '3.8'
       - name: Display Python version
         run: python -c "import sys; print(sys.version)"
-      - name: Download Ninja
-        uses: seanmiddleditch/gha-setup-ninja@master
-        with:
-          version: ${{ env.NINJA_VERSION }}
+
+        # workaround a poor interaction between github actions/cmake/vcpkg, see https://github.com/lukka/run-vcpkg/issues/88#issuecomment-885758902
+      - name: Use CMake 3.20.1
+        uses: lukka/[email protected]
+
       - name: Download buildcache
         id: buildcache-download
         shell: cmake -P {0}
@@ -152,7 +152,7 @@ jobs:
           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) }}-v01
+          appendedCacheKey: ${{ hashFiles(env.VCPKGRESPONSEFILE) }}-cache-key-v2
 
       - name: Cache dynamic version of OpenSSL (Linux)
         if: "contains( matrix.config.os, 'ubuntu_disabled')"

.github/workflows/centos7.yml

@@ -11,7 +11,7 @@ jobs:
     container:
       image: centos:7
     steps:
-    - name: Intall Dependencies
+    - name: Install Dependencies
       run: | 
         yum install -y centos-release-scl
         yum-config-manager --enable rhel-server-rhscl-7-rpms
@@ -30,12 +30,12 @@ jobs:
         yum install -y mesa-libGL-devel
         yum install -y freeglut-devel
 
-        yum install -y devtoolset-7
+        yum install -y devtoolset-10
         
         yum install -y rh-python36
     - name: Build QtCharts
       run: |
-        source /opt/rh/devtoolset-7/enable
+        source /opt/rh/devtoolset-10/enable
         git clone git://code.qt.io/qt/qtcharts.git
         cd qtcharts/
         git checkout v5.9.7
@@ -55,7 +55,7 @@ jobs:
         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-7/enable
+        source /opt/rh/devtoolset-10/enable
         source /opt/rh/rh-python36/enable
 
         cmake3 --version

.github/workflows/cmake-format.yml

@@ -6,7 +6,7 @@ jobs:
   cmake-format-job:
     runs-on: ubuntu-latest
     steps:
-    - name: Install cmakelang for cmake-format
+    - name: Install cmakelang for cmake-format 
       run: |
         python3 -m pip install --user cmakelang
     - uses: actions/checkout@v2
@@ -16,6 +16,7 @@ jobs:
 
         cd ApplicationLibCode
         find -name CMake*.txt | xargs ~/.local/bin/cmake-format -c ${{ github.workspace }}/cmake/cmake-format.py -i
+        find -name CMake*.cmake | xargs ~/.local/bin/cmake-format -c ${{ github.workspace }}/cmake/cmake-format.py -i
         cd ..
 
         cd ApplicationExeCode

.gitignore

@@ -64,6 +64,7 @@ out
 build
 CMakeSettings.json
 enc_temp_folder
+CMakePresets.json
 
 #Visual Studio Code files
 .vscode
@@ -78,3 +79,5 @@ enc_temp_folder
 
 #Python
 *.pyc
+
+*.ESMRY

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "ThirdParty/vcpkg"]
 	path = ThirdParty/vcpkg
 	url = https://github.com/CeetronSolutions/vcpkg
+[submodule "ThirdParty/fast_float"]
+	path = ThirdParty/fast_float
+	url = https://github.com/fastfloat/fast_float