From e42f4bde9164ddec654cf2599cfdaed0d478efc3 Mon Sep 17 00:00:00 2001 From: Ivan Ivanov Date: Mon, 8 Jul 2024 01:12:35 +0300 Subject: [PATCH] So long `travis` and thanks for all the fish --- .docker/docker-compose.travis.yml | 18 ------------------ ...ocker-compose.gh.yml => docker-compose.yml} | 0 .github/workflows/continuous_integration.yml | 2 +- 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 .docker/docker-compose.travis.yml rename .docker/{docker-compose.gh.yml => docker-compose.yml} (100%) diff --git a/.docker/docker-compose.travis.yml b/.docker/docker-compose.travis.yml deleted file mode 100644 index aebb8c16..00000000 --- a/.docker/docker-compose.travis.yml +++ /dev/null @@ -1,18 +0,0 @@ -version: '3' -services: -# postgres: -# image: kartoza/postgis:10.0-2.4 -# environment: -# - ALLOW_IP_RANGE="172.0.0.0/8" - - qgis: - build: - context: .. - dockerfile: ./.docker/Dockerfile - args: - QGIS_TEST_VERSION: ${QGIS_TEST_VERSION} - tty: true - volumes: - - ${TRAVIS_BUILD_DIR}:/usr/src -# links: -# - postgres diff --git a/.docker/docker-compose.gh.yml b/.docker/docker-compose.yml similarity index 100% rename from .docker/docker-compose.gh.yml rename to .docker/docker-compose.yml diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index e97f7537..c01ab86e 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -45,7 +45,7 @@ jobs: - name: Test run: | - docker compose -f .docker/docker-compose.gh.yml run qgis /usr/src/.docker/run-docker-tests.sh + docker compose -f .docker/docker-compose.yml run qgis /usr/src/.docker/run-docker-tests.sh test-22-04: runs-on: ubuntu-22.04