Github actions and docker files updated, and clean up

Author: XavierCLL

.docker/Dockerfile

@@ -2,19 +2,13 @@ ARG QGIS_TEST_VERSION=latest
 FROM qgis/qgis:${QGIS_TEST_VERSION}
 
 # Install system dependencies
-RUN apt-get clean && \
-    rm -rf /var/lib/apt/lists/* && \
-    apt-get update -o Acquire::Retries=3 && \
-    apt-get install -y --no-install-recommends \
-        python3-pip \
-        xvfb \
-        xauth \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends python3-pip && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
 
-# Copy and install Python test dependencies
-COPY ./requirements_test.txt /tmp/
-RUN pip3 install --no-cache-dir -r /tmp/requirements_test.txt --break-system-packages
+COPY ./pyproject.toml /tmp/
+RUN pip3 install "/tmp/.[test]" --break-system-packages
 
 # Set environment variables
 ENV LANG=C.UTF-8
@@ -23,4 +17,4 @@ ENV IS_DOCKER_CONTAINER=true
 ENV QT_QPA_PLATFORM=offscreen
 ENV DISPLAY=:99
 
-WORKDIR /usr/src
+WORKDIR /

.docker/docker-compose.gh.yml

@@ -4,7 +4,8 @@ services:
       context: ..
       dockerfile: ./.docker/Dockerfile
       args:
-        QGIS_TEST_VERSION: ${QGIS_TEST_VERSION}
+        QGIS_TEST_VERSION: ${QGIS_TEST_VERSION:-latest}
     tty: true
     volumes:
-      - ${GITHUB_WORKSPACE}:/usr/src/ThRasE
+      - ${GITHUB_WORKSPACE:-.}:/usr/src/ThRasE
+    working_dir: /usr/src/ThRasE

.docker/run-docker-tests.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-pushd /usr/src
-DEFAULT_PARAMS='./ThRasE/tests/ -v --qgis_disable_gui --qgis_disable_init'
-xvfb-run -a -s "-screen 0 1920x1080x24" pytest ${@:-`echo $DEFAULT_PARAMS`}
-popd
+cd /usr/src/ThRasE
+
+DEFAULT_PARAMS='./tests/ -v --qgis_disable_gui --qgis_disable_init'
+xvfb-run pytest ${@:-$DEFAULT_PARAMS}

.docker/run-tests.sh

@@ -8,7 +8,7 @@ on:
       - "docs/**"
 
 concurrency:
-  group: "pages"
+  group: pages
   cancel-in-progress: false
 
 permissions:
@@ -18,24 +18,24 @@ jobs:
   build-docs:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-
-    - name: "Set up Python 3.10"
-      uses: actions/setup-python@v4
-      with:
-        python-version: "3.10"
-
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r requirements_docs.txt
-
-    - name: Build
-      run: |
-        jupyter-book build docs
-
-    - name: Deploy to GitHub Pages
-      uses: peaceiris/actions-gh-pages@v4
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        publish_dir: docs/_build/html
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install ".[docs]"
+
+      - name: Build documentation
+        run: jupyter-book build docs
+
+      - name: Deploy to GitHub Pages
+        uses: peaceiris/actions-gh-pages@v4
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: docs/_build/html

.github/workflows/build_docs.yml

@@ -2,28 +2,39 @@ name: Tests
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
 jobs:
   tests:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        docker_tags: [ ltr, stable ]
+        qgis_version: [ltr, stable]
       fail-fast: false
+
     env:
-      QGIS_TEST_VERSION: ${{ matrix.docker_tags }}
+      QGIS_TEST_VERSION: ${{ matrix.qgis_version }}
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           submodules: recursive
+          lfs: true
+
+      - name: Set up Git LFS
+        run: |
+          git lfs install
+          git lfs pull
+
+      - name: Build Docker image
+        run: docker compose -f .docker/docker-compose.gh.yml build
 
-      - name: Pull QGIS Docker image
-        run: docker pull qgis/qgis:${QGIS_TEST_VERSION}
+      - name: Run tests
+        run: docker compose -f .docker/docker-compose.gh.yml run --rm qgis /usr/src/ThRasE/.docker/run-docker-tests.sh
 
-      - name: Run tests with Docker
-        run: docker compose -f .docker/docker-compose.gh.yml run qgis /usr/src/ThRasE/.docker/run-docker-tests.sh
+      - name: Cleanup
+        if: always()
+        run: docker compose -f .docker/docker-compose.gh.yml down --rmi local