mirror of
https://github.com/qgis/QGIS.git
synced 2025-10-08 00:05:09 -04:00
GH_WORKSPACE -> QGIS_WORKSPACE
This commit is contained in:
parent
91fe84841d
commit
5e3277573b
@ -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:
|
||||
|
@ -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:
|
||||
|
@ -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
|
||||
|
4
.github/workflows/run-tests.yml
vendored
4
.github/workflows/run-tests.yml
vendored
@ -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
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user