sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-06 00:07:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

GH_WORKSPACE -> QGIS_WORKSPACE

Browse Source
This commit is contained in:
Sandro Santilli 2022-01-28 19:48:59 +01:00
parent 91fe84841d
commit 5e3277573b
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.docker/docker-compose-testing-oracle.yml
View File

@ -15,7 +15,7 @@ services:
tty: true tty: true
image: qgis3-build-deps-binary-image image: qgis3-build-deps-binary-image
volumes: volumes:
- ${GH_WORKSPACE}:/root/QGIS - ${QGIS_WORKSPACE}:/root/QGIS
links: links:
- oracle - oracle
env_file: env_file:

2
.docker/docker-compose-testing-postgres.yml
View File

@ -15,7 +15,7 @@ services:
tty: true tty: true
image: qgis3-build-deps-binary-image image: qgis3-build-deps-binary-image
volumes: volumes:
- ${GH_WORKSPACE}:/root/QGIS - ${QGIS_WORKSPACE}:/root/QGIS
links: links:
- postgres - postgres
env_file: env_file:

6
.docker/docker-compose-testing.yml
View File

@ -14,15 +14,15 @@ services:
webdav: webdav:
image: nginx image: nginx
volumes: volumes:
- ${GH_WORKSPACE}/.docker/webdav/nginx.conf:/etc/nginx/conf.d/default.conf - ${QGIS_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/passwords.list:/etc/nginx/.passwords.list
- /tmp/webdav_tests:/tmp/webdav_tests_root/webdav_tests - /tmp/webdav_tests:/tmp/webdav_tests_root/webdav_tests
qgis-deps: qgis-deps:
tty: true tty: true
image: qgis3-build-deps-binary-image image: qgis3-build-deps-binary-image
volumes: volumes:
- ${GH_WORKSPACE}:/root/QGIS - ${QGIS_WORKSPACE}:/root/QGIS
links: links:
# - mssql # - mssql
- webdav - webdav

4
.github/workflows/run-tests.yml vendored
View File

@ -27,7 +27,7 @@ jobs:
env: env:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} 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') }} RUN_FLAKY_TESTS: ${{ contains( github.event.pull_request.labels.*.name, 'run flaky tests') }}
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -280,7 +280,7 @@ jobs:
env: env:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} 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 runs-on: ubuntu-latest