From 21cc62dbd4273eb3c8ba069f8a1c49ae3778f4e5 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Sun, 12 Sep 2021 13:42:36 +0200 Subject: [PATCH 1/2] Fix typing yet again Compatibility with Python 3.7 /osgeo installer v1 --- qfieldsync/libqfieldsync | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qfieldsync/libqfieldsync b/qfieldsync/libqfieldsync index e5c1831a..3ed363d8 160000 --- a/qfieldsync/libqfieldsync +++ b/qfieldsync/libqfieldsync @@ -1 +1 @@ -Subproject commit e5c1831ad477ef05c27fb45c92fec1457cc0bcd3 +Subproject commit 3ed363d8ab13426e6419138b66b1985e5742ff72 From 9499246f4cb61d266dc1e5c82133e0c5359a59f5 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Sun, 12 Sep 2021 13:55:11 +0200 Subject: [PATCH 2/2] add test with python 3.6 --- .github/workflows/continuous_integration.yml | 21 +++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 13dee010..d89cacd4 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -48,10 +48,29 @@ jobs: uses: actions/checkout@v2 with: submodules: recursive - - name: Test on QGIS LTR 3. + - name: Test run: | docker-compose -f .docker/docker-compose.gh.yml run qgis /usr/src/.docker/run-docker-tests.sh + test-18-04: + runs-on: ubuntu-18.04 + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + submodules: recursive + - name: Test + run: | + wget -qO - https://qgis.org/downloads/qgis-2021.gpg.key | sudo gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/qgis-archive.gpg --import + sudo chmod a+r /etc/apt/trusted.gpg.d/qgis-archive.gpg + sudo add-apt-repository "deb https://qgis.org/ubuntu $(lsb_release -c -s) main" + + sudo apt update + sudo apt install qgis + sudo pip3 install pytest nose2 mock + + xvfb-run pytest + release: runs-on: ubuntu-20.04 env: