From e6c8da21cabc32be19d7ae9c63865bc30f1e0478 Mon Sep 17 00:00:00 2001
From: Margriet Palm <margriet.palm@nelen-schuurmans.nl>
Date: Fri, 16 Feb 2024 12:36:04 +0100
Subject: [PATCH] Change PPA step so it, hopefully, only runs for gdal36 test

---
 .github/workflows/test.yml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fbd9c098..139f55c8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,7 +22,6 @@ jobs:
             display_name: "2019"
             pins: "h5py==2.10.* sqlalchemy==1.4.10 shapely==2.0.* pyproj==3.0.*"
             extras: "[test,gridadmin]"
-            ppa: ""
           # 2020
           - python: 3.9
             os: ubuntu-20.04
@@ -30,7 +29,6 @@ jobs:
             display_name: "2020"
             pins: "h5py==3.1.* sqlalchemy==1.4.20 shapely==2.0.* pyproj==3.0.*"
             extras: "[test,gridadmin]"
-            ppa: ""
           # 2021
           - python: 3.9
             os: ubuntu-20.04
@@ -38,7 +36,6 @@ jobs:
             display_name: "2021"
             pins: "h5py==3.3.* sqlalchemy==1.4.30 shapely==2.0.* pyproj==3.2.*"
             extras: "[test,gridadmin]"
-            ppa: ""
           # 2022
           - python: '3.10'
             os: ubuntu-22.04
@@ -46,7 +43,6 @@ jobs:
             display_name: "2022"
             pins: "h5py==3.7.* sqlalchemy==1.4.40 shapely==2.0.* pyproj==3.4.*"
             extras: "[test,gridadmin]"
-            ppa: ""
           # 2023
           - python: '3.11'
             os: ubuntu-22.04
@@ -54,7 +50,6 @@ jobs:
             pins: "h5py==3.10.* sqlalchemy==2.0.* shapely==2.0.* pyproj==3.6.*"
             display_name: "2023"
             extras: "[test,gridadmin]"
-            ppa: ""
           # current (still using 3.11 because 3.12 breaks; see issue 348)
           - python: '3.11'
             os: ubuntu-latest
@@ -62,14 +57,12 @@ jobs:
             pins: ""
             display_name: "latest"
             extras: "[test,gridadmin]"
-            ppa: ""
           - python: '3.11'
             os: ubuntu-latest
             numpy: numpy==1.24.*
             pins: ""
             display_name: "GDAL36"
             extras: "[test,gridadmin]"
-            ppa: "ppa:ubuntugis/ppa"
 
 
     steps:
@@ -84,9 +77,9 @@ jobs:
 
       - name: Add PPA
         run: |
-          sudo add-apt-repository ${{ matrix.ppa }} -y && sudo apt update
+          sudo add-apt-repository "ppa:ubuntugis/ppa" -y && sudo apt update
           apt show libgdal-dev | grep Version          
-        if: matrix.ppa != '""'
+        if: matrix.display_name == "GDAL36"
 
       - name: Install GDAL, sqlite3 and spatialite
         run: |