Merge branch 'master' of https://github.com/firelab/windninja

Author: masonwillman

.github/workflows/testing.yml

@@ -20,9 +20,9 @@ jobs:
       uses: actions/cache@v3
       with:
         path: |
-          ${{github.workspace}}/scripts/poppler-0.23.4
-          ${{github.workspace}}/scripts/proj-6.3.2
-          ${{github.workspace}}/scripts/gdal-3.2.1
+          ${{github.workspace}}/scripts/poppler-22.02.0
+          ${{github.workspace}}/scripts/proj-8.2.1
+          ${{github.workspace}}/scripts/gdal-3.4.1
         key: ${{ runner.os }}-windDep
         restore-keys: ${{ runner.os }}-windDep
 
@@ -32,7 +32,7 @@ jobs:
         sudo -E apt-get update -y
         sudo -E apt-get upgrade -y
         cd ${{github.workspace}}/scripts
-        ./build_deps_ubuntu_2004.sh
+        ./build_deps_ubuntu_2204.sh
         # return to start directory
         cd ${{github.workspace}}
       
@@ -42,29 +42,24 @@ jobs:
         # install standard dependencies
         sudo -E apt-get update -y
         sudo -E apt-get upgrade -y
-        sudo -E apt-get install -y pkg-config libfontconfig1-dev libcurl4-gnutls-dev libnetcdf-dev \
-                                   libboost-program-options-dev libboost-date-time-dev libgeos-dev \
-                                   libboost-test-dev libsqlite3-dev sqlite3
+        sudo apt install -y libfontconfig1-dev \
+                            libcurl4-gnutls-dev \
+                            libnetcdf-dev \
+                            libboost-program-options-dev \
+                            libboost-date-time-dev \
+                            libgeos-dev \
+                            libboost-test-dev \
+                            libsqlite3-dev \
+                            sqlite3 \
+                            libopenjp2-7-dev \
+                            libtiff-dev
         # sudo make poppler, proj, and gdal
         cd ${{github.workspace}}/scripts/poppler-0.23.4
         sudo make install
         cd ${{github.workspace}}/scripts/proj-6.3.2
         sudo make install
         cd ${{github.workspace}}/scripts/gdal-3.2.1
         sudo make install
-        # install qt
-        sudo add-apt-repository ppa:rock-core/qt4
-        sudo apt-get update
-        sudo -E apt-get install -y libqt4-dev libqtwebkit-dev
-        # Use OpenFOAM 8
-        # add the dl.openfoam.org repo and install OpenFOAM 8
-        sudo sh -c "wget -O - https://dl.openfoam.org/gpg.key | apt-key add -"
-        sudo add-apt-repository http://dl.openfoam.org/ubuntu
-        sudo apt-get update
-        sudo -E apt-get install -y openfoam8
-        echo "source /opt/openfoam8/etc/bashrc" >> ~/.bashrc
-        # return to start directory
-        cd ${{github.workspace}}
 
     - name: make build directory
       run: mkdir build