Merge pull request #140 from PDOK/PDOK-17406-upgrade-github-actions

Bump actions/cache from v2 to v4

Author: Robbert2407

.github/workflows/build-and-publish-dockerhub.yml

@@ -42,7 +42,7 @@ jobs:
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v1
     - name: Cache Docker layers
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: /tmp/.buildx-cache
         key: ${{ runner.os }}-buildx-${{ github.sha }}

.github/workflows/pytest.yml

@@ -9,26 +9,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-24.04, ubuntu-22.04, ubuntu-20.04] # no ubuntugis @ ubuntu-24.04
+        os: [ubuntu-24.04, ubuntu-22.04] # no ubuntugis @ ubuntu-24.04
         python-version: ['3.11', '3.10', '3.9', '3.8']
-        gdal-version: ['3.8', '3.6', '3.4']
         exclude:
           - os: ubuntu-24.04
             python-version: '3.9'
-          - os: ubuntu-24.04
-            gdal-version: '3.6'
-          - os: ubuntu-24.04
-            gdal-version: '3.4'
-          - os: ubuntu-22.04
-            gdal-version: '3.4'
-          - os: ubuntu-22.04
-            gdal-version: '3.8'
-          - os: ubuntu-20.04
-            python-version: '3.11'
-          - os: ubuntu-20.04
-            gdal-version: '3.6'
-          - os: ubuntu-20.04
-            gdal-version: '3.8'
     steps:
     - name: Checkout 🛎️
       uses: actions/checkout@v3
@@ -39,22 +24,13 @@ jobs:
     - name: install gdal
       id: gdal
       run: |
-        if [ "${{ matrix.os }}" = "ubuntu-20.04" ]
-        then
-          echo adding ubuntugis unstable
-          sudo apt-add-repository ppa:ubuntugis/ubuntugis-unstable
-        else
-          echo adding ubuntugis stable
-          sudo apt-add-repository ppa:ubuntugis/ppa
-        fi
         sudo apt-get update || true # ignore erros becouse we can not install gdal from `ppa:ubuntugis/ppa` without apt errors
         echo available python3-gdal versions: $(apt-cache madison python3-gdal | cut -f2 -d "|" | tr -d " ")
         echo available libgdal-dev versions: $(apt-cache madison libgdal-dev | cut -f2 -d "|" | tr -d " ")
-        export APT_GDAL_VERSION=$(apt-cache madison python3-gdal | grep ${{ matrix.gdal-version }} | head -n1 | cut -f2 -d "|" | tr -d " ")
+        export APT_GDAL_VERSION=$(apt-cache madison python3-gdal | head -n1 | cut -f2 -d "|" | tr -d " ")
         echo "using version ->${APT_GDAL_VERSION}<-"
-        apt-cache madison libgdal30 | grep "${APT_GDAL_VERSION}" && sudo apt-get install libgdal30="${APT_GDAL_VERSION}"
-        sudo apt-get install python3-gdal="${APT_GDAL_VERSION}" libgdal-dev="${APT_GDAL_VERSION}"
         echo gdal_version=$(echo "${APT_GDAL_VERSION}" | cut -f1 -d '+') >> $GITHUB_OUTPUT
+        sudo apt-get install python3-gdal libgdal-dev
     - name: Install dependencies for test
       run: |
         python -m pip install --upgrade pip wheel
@@ -63,7 +39,7 @@ jobs:
     - name: Install dependencies from config
       run: |
         # we need to pin GDAL here to match the python3-gdal
-        pip install GDAL==${{steps.gdal.outputs.gdal_version}}
+        pip3 install GDAL==${{steps.gdal.outputs.gdal_version}}
         pip3 install --no-cache-dir .[test]
     - name: Test with pytest
       run: |