Skip to content

Commit

Permalink
CI: replace --tmp-location with --tmp-project (#3825)
Browse files Browse the repository at this point in the history
  • Loading branch information
neteler committed Jun 15, 2024
1 parent c397951 commit b312954
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/print_versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)')"
6 changes: 3 additions & 3 deletions .github/workflows/test_simple.bat
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions .github/workflows/test_simple.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions .github/workflows/test_thorough.bat
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions .github/workflows/test_thorough.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 $@

0 comments on commit b312954

Please sign in to comment.