Merge branch 'koordinates:main' into icon-reusability

hamishcampbell · Aug 13, 2024 · d693ced · d693ced
2 parents 4d5a2c6 + 4937fb9
commit d693ced
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
@@ -1,6 +1,8 @@
 ARG QGIS_TEST_VERSION=latest
 FROM qgis/qgis:${QGIS_TEST_VERSION}
 
+ENV PIP_BREAK_SYSTEM_PACKAGES 1
+
 RUN apt-get update && \
     apt-get install -y python3-pip
 COPY ./requirements.txt /tmp/

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -16,18 +16,18 @@ jobs:
 
     strategy:
       matrix:
-        qgis_version: [release-3_28, latest]
+        qgis_version: [release-3_34, latest]
       fail-fast: false
 
     env:
       QGIS_TEST_VERSION: ${{ matrix.qgis_version }}
-      KART_VERSION: "0.15.0"
+      KART_VERSION: "0.15.2"
 
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
       - name: Test on QGIS
         run: >
-          docker-compose -f .docker/docker-compose.gh.yml run --build --rm
+          docker compose -f .docker/docker-compose.gh.yml run --build --rm
           qgis /usr/src/.docker/run-docker-tests.sh
diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh
@@ -2,5 +2,5 @@
 
 cd $(dirname $0)/..
 export GITHUB_WORKSPACE=$PWD
-docker-compose -f .docker/docker-compose.gh.yml run qgis /usr/src/.docker/run-docker-tests.sh $@
-docker-compose -f .docker/docker-compose.gh.yml rm -s -f
+docker compose -f .docker/docker-compose.gh.yml run qgis /usr/src/.docker/run-docker-tests.sh $@
+docker compose -f .docker/docker-compose.gh.yml rm -s -f