From b31295488ef0cfef9ed0e22c78266c0ea4b27bac Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Sat, 15 Jun 2024 14:12:03 +0200 Subject: [PATCH] CI: replace --tmp-location with --tmp-project (#3825) --- .github/workflows/macos.yml | 4 ++-- .github/workflows/print_versions.sh | 4 ++-- .github/workflows/test_simple.bat | 6 +++--- .github/workflows/test_simple.sh | 6 +++--- .github/workflows/test_thorough.bat | 4 ++-- .github/workflows/test_thorough.sh | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 2ff85928636..60b8562e6a0 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -61,9 +61,9 @@ jobs: - name: Run tests shell: bash -el {0} run: > - grass --tmp-location XY --exec \ + grass --tmp-project XY --exec \ g.download.location url=${{ env.SampleData }} path=$HOME - grass --tmp-location XY --exec \ + grass --tmp-project XY --exec \ python3 -m grass.gunittest.main \ --grassdata $HOME --location nc_spm_full_v2alpha2 --location-type nc \ --min-success 100 --config .github/workflows/macos_gunittest.cfg diff --git a/.github/workflows/print_versions.sh b/.github/workflows/print_versions.sh index 25b77eae2ec..68b359c1b96 100755 --- a/.github/workflows/print_versions.sh +++ b/.github/workflows/print_versions.sh @@ -10,6 +10,6 @@ git --version # This will fail if the build failed. grass --version -grass --tmp-location XY --exec g.version -ergb +grass --tmp-project XY --exec g.version -ergb # Detailed Python version info (in one line thanks to echo) -grass --tmp-location XY --exec bash -c "echo Python: \$(\$GRASS_PYTHON -c 'import sys; print(sys.version)')" +grass --tmp-project XY --exec bash -c "echo Python: \$(\$GRASS_PYTHON -c 'import sys; print(sys.version)')" diff --git a/.github/workflows/test_simple.bat b/.github/workflows/test_simple.bat index 394421ceddb..a558c2ad40d 100644 --- a/.github/workflows/test_simple.bat +++ b/.github/workflows/test_simple.bat @@ -1,8 +1,8 @@ set grass=%1 rem Test execution of binary command -call %grass% --tmp-location EPSG:4326 --exec g.region res=0.1 -p +call %grass% --tmp-project EPSG:4326 --exec g.region res=0.1 -p rem Test if batch-wrapper-scripts without extension are found -call %grass% --tmp-location EPSG:4326 --exec C:/Windows/System32/where.exe t.create +call %grass% --tmp-project EPSG:4326 --exec C:/Windows/System32/where.exe t.create rem Test if python-scripts can be called -call %grass% --tmp-location EPSG:4326 --exec t.create --help +call %grass% --tmp-project EPSG:4326 --exec t.create --help diff --git a/.github/workflows/test_simple.sh b/.github/workflows/test_simple.sh index 43a19a3d457..2647cfccaca 100755 --- a/.github/workflows/test_simple.sh +++ b/.github/workflows/test_simple.sh @@ -4,8 +4,8 @@ set -e # Test execution of binary command -grass --tmp-location EPSG:4326 --exec g.region res=0.1 -p +grass --tmp-project EPSG:4326 --exec g.region res=0.1 -p # Test if python modules without extension are found -grass --tmp-location EPSG:4326 --exec which t.create +grass --tmp-project EPSG:4326 --exec which t.create # Test if python modules can be called -grass --tmp-location EPSG:4326 --exec t.create --help +grass --tmp-project EPSG:4326 --exec t.create --help diff --git a/.github/workflows/test_thorough.bat b/.github/workflows/test_thorough.bat index 8a39afe827f..4b03a5608be 100644 --- a/.github/workflows/test_thorough.bat +++ b/.github/workflows/test_thorough.bat @@ -1,5 +1,5 @@ set grass=%1 set python=%2 -call %grass% --tmp-location XY --exec g.download.location url=https://grass.osgeo.org/sampledata/north_carolina/nc_spm_full_v2alpha2.tar.gz path=%USERPROFILE% -call %grass% --tmp-location XY --exec %python% -m grass.gunittest.main --grassdata %USERPROFILE% --location nc_spm_full_v2alpha2 --location-type nc --min-success 80 +call %grass% --tmp-project XY --exec g.download.location url=https://grass.osgeo.org/sampledata/north_carolina/nc_spm_full_v2alpha2.tar.gz path=%USERPROFILE% +call %grass% --tmp-project XY --exec %python% -m grass.gunittest.main --grassdata %USERPROFILE% --location nc_spm_full_v2alpha2 --location-type nc --min-success 80 diff --git a/.github/workflows/test_thorough.sh b/.github/workflows/test_thorough.sh index 6c4d9e32b91..dba6b94b77d 100755 --- a/.github/workflows/test_thorough.sh +++ b/.github/workflows/test_thorough.sh @@ -3,10 +3,10 @@ # fail on non-zero return code from a subprocess set -e -grass --tmp-location XY --exec \ +grass --tmp-project XY --exec \ g.download.location url=https://grass.osgeo.org/sampledata/north_carolina/nc_spm_full_v2alpha2.tar.gz path=$HOME -grass --tmp-location XY --exec \ +grass --tmp-project XY --exec \ python3 -m grass.gunittest.main \ --grassdata $HOME --location nc_spm_full_v2alpha2 --location-type nc \ --min-success 100 $@