Skip to content

Commit 6c3a4ec

Browse files
committed
Remove unnecessary cmd invocations
1 parent 48c3e56 commit 6c3a4ec

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

appveyor.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ install:
3434
# install MySQL 5.6
3535
# - cmd: curl -L -O -S -s https://dev.mysql.com/get/Downloads/MySQLInstaller/mysql-installer-web-community-5.6.36.0.msi
3636
# - cmd: msiexec /i mysql-installer-web-community-5.6.36.0.msi /quiet
37-
# - cmd: cmd /c ""C:\Program Files (x86)\MySQL\MySQL Installer for Windows\MySQLInstallerConsole.exe" community install server;5.6.36;x64:*:port=3306;passwd=Password12! -silent"
37+
# - cmd: "C:\Program Files (x86)\MySQL\MySQL Installer for Windows\MySQLInstallerConsole.exe" community install server;5.6.36;x64:*:port=3306;passwd=Password12! -silent
3838

3939
# change default port for MySQL 5.7 (so it can run simultaneously with MySQL 5.6)
4040
# - ps: $iniPath = 'C:\ProgramData\MySQL\MySQL Server 5.7\my.ini'
@@ -50,9 +50,10 @@ install:
5050
- cmd: xcopy /s /y /q postgis-pg84-binaries-1.5.5 "C:\Program Files (x86)\PostgreSQL\8.4"
5151
- cmd: SET PGPASSWORD=Password12!
5252
- cmd: SET PGDIR=C:\Program Files (x86)\PostgreSQL\8.4
53-
- cmd: cmd /c ""%PGDIR%\bin\createdb" -p 5431 -U postgres template_postgis"
54-
- cmd: cmd /c ""%PGDIR%\bin\psql" -q -p 5431 -U postgres -d template_postgis -f "%PGDIR%\share\contrib\postgis-1.5\postgis.sql""
55-
- cmd: cmd /c ""%PGDIR%\bin\psql" -q -p 5431 -U postgres -d template_postgis -f "%PGDIR%\share\contrib\postgis-1.5\spatial_ref_sys.sql""
53+
- cmd: SET PATH=%PGDIR%\bin;%PATH%
54+
- cmd: createdb -p 5431 -U postgres template_postgis
55+
- cmd: psql -q -p 5431 -U postgres -d template_postgis -f "%PGDIR%\share\contrib\postgis-1.5\postgis.sql"
56+
- cmd: psql -q -p 5431 -U postgres -d template_postgis -f "%PGDIR%\share\contrib\postgis-1.5\spatial_ref_sys.sql"
5657

5758
# install PostGIS 2.3.2 for PostgreSQL 9.6
5859
- cmd: curl -L -O -S -s http://download.osgeo.org/postgis/windows/pg96/archive/postgis-bundle-pg96-2.3.2x64.zip
@@ -98,19 +99,19 @@ before_test:
9899
# setup MySQL 5.6
99100
# - cmd: SET MYSQL_PWD=Password12!
100101
# - cmd: SET mysql="C:\Program Files\MySQL\MySQL Server 5.6\bin\mysql.exe"
101-
# - cmd: cmd /c "%mysql% -P 3306 -u root < Tests.NHibernate.Spatial.MySQL\nhsp_test.sql"
102+
# - cmd: '%mysql% -P 3306 -u root < Tests.NHibernate.Spatial.MySQL\nhsp_test.sql'
102103

103104
# setup MySQL 5.7
104105
# - cmd: SET mysql="C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql.exe"
105-
# - cmd: cmd /c "%mysql% -P 3307 -u root < Tests.NHibernate.Spatial.MySQL57\nhsp_test.sql"
106+
# - cmd: '%mysql% -P 3307 -u root < Tests.NHibernate.Spatial.MySQL57\nhsp_test.sql'
106107

107108
# setup PostgreSQL 8.4
108109
- cmd: SET psql="C:\Program Files (x86)\PostgreSQL\8.4\bin\psql.exe"
109-
- cmd: cmd /c "%psql% -q -p 5431 -U postgres -f Tests.NHibernate.Spatial.PostGis\nhsp_test.sql"
110+
- cmd: '%psql% -q -p 5431 -U postgres -f Tests.NHibernate.Spatial.PostGis\nhsp_test.sql'
110111

111112
# setup PostgreSQL 9.6
112113
- cmd: SET psql="C:\Program Files\PostgreSQL\9.6\bin\psql.exe"
113-
- cmd: cmd /c "%psql% -q -p 5432 -U postgres -f Tests.NHibernate.Spatial.PostGis20\nhsp_test.sql"
114+
- cmd: '%psql% -q -p 5432 -U postgres -f Tests.NHibernate.Spatial.PostGis20\nhsp_test.sql'
114115

115116
test_script:
116117
- cmd: dotnet test -c Release --no-build --logger "trx;LogFileName=MsSql2008.trx" --results-directory %APPVEYOR_BUILD_FOLDER% Tests.NHibernate.Spatial.MsSql2008

0 commit comments

Comments
 (0)