From 5e3277573bdeb6492bbc0a467af98179a648e022 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@kbt.io>
Date: Fri, 28 Jan 2022 19:48:59 +0100
Subject: [PATCH] GH_WORKSPACE -> QGIS_WORKSPACE

---
 .docker/docker-compose-testing-oracle.yml   | 2 +-
 .docker/docker-compose-testing-postgres.yml | 2 +-
 .docker/docker-compose-testing.yml          | 6 +++---
 .github/workflows/run-tests.yml             | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.docker/docker-compose-testing-oracle.yml b/.docker/docker-compose-testing-oracle.yml
index fbf90274d36..8a82673790a 100644
--- a/.docker/docker-compose-testing-oracle.yml
+++ b/.docker/docker-compose-testing-oracle.yml
@@ -15,7 +15,7 @@ services:
     tty: true
     image: qgis3-build-deps-binary-image
     volumes:
-      - ${GH_WORKSPACE}:/root/QGIS
+      - ${QGIS_WORKSPACE}:/root/QGIS
     links:
       - oracle
     env_file:
diff --git a/.docker/docker-compose-testing-postgres.yml b/.docker/docker-compose-testing-postgres.yml
index 577baf3e279..274bb66baa1 100644
--- a/.docker/docker-compose-testing-postgres.yml
+++ b/.docker/docker-compose-testing-postgres.yml
@@ -15,7 +15,7 @@ services:
     tty: true
     image: qgis3-build-deps-binary-image
     volumes:
-      - ${GH_WORKSPACE}:/root/QGIS
+      - ${QGIS_WORKSPACE}:/root/QGIS
     links:
       - postgres
     env_file:
diff --git a/.docker/docker-compose-testing.yml b/.docker/docker-compose-testing.yml
index e722c54827e..7c97322c7cc 100755
--- a/.docker/docker-compose-testing.yml
+++ b/.docker/docker-compose-testing.yml
@@ -14,15 +14,15 @@ services:
   webdav:
     image: nginx
     volumes:
-      - ${GH_WORKSPACE}/.docker/webdav/nginx.conf:/etc/nginx/conf.d/default.conf
-      - ${GH_WORKSPACE}/.docker/webdav/passwords.list:/etc/nginx/.passwords.list
+      - ${QGIS_WORKSPACE}/.docker/webdav/nginx.conf:/etc/nginx/conf.d/default.conf
+      - ${QGIS_WORKSPACE}/.docker/webdav/passwords.list:/etc/nginx/.passwords.list
       - /tmp/webdav_tests:/tmp/webdav_tests_root/webdav_tests
 
   qgis-deps:
     tty: true
     image: qgis3-build-deps-binary-image
     volumes:
-      - ${GH_WORKSPACE}:/root/QGIS
+      - ${QGIS_WORKSPACE}:/root/QGIS
     links:
     #  - mssql
       - webdav
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 362cd6b378f..e873df2a7fd 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -27,7 +27,7 @@ jobs:
     env:
       DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
       DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-      GH_WORKSPACE: ${{ github.workspace }} # used in docker compose
+      QGIS_WORKSPACE: ${{ github.workspace }} # used in docker compose
       RUN_FLAKY_TESTS: ${{ contains( github.event.pull_request.labels.*.name, 'run flaky tests') }}
 
     runs-on: ubuntu-latest
@@ -280,7 +280,7 @@ jobs:
     env:
       DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
       DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-      GH_WORKSPACE: ${{ github.workspace }} # used in docker compose
+      QGIS_WORKSPACE: ${{ github.workspace }} # used in docker compose
 
     runs-on: ubuntu-latest