Commit 6adf045f authored by Andy Nichols's avatar Andy Nichols
Browse files

Update .gitlab-ci.yml

parent e7757633
Pipeline #4559 passed with stage
in 4 minutes and 45 seconds
...@@ -17,7 +17,7 @@ build_with_linux: ...@@ -17,7 +17,7 @@ build_with_linux:
script: script:
- echo "Starting Build" - echo "Starting Build"
- mkdir build && cd build - mkdir build && cd build
- ~/Qt/5.12.3/gcc_64/bin/qmake ../qtdemonrender.pro - ~/Qt/5.12.3/gcc_64/bin/qmake ../qtquick3d.pro
- make - make
- make sub-tests - make sub-tests
- cd tests && make check - cd tests && make check
...@@ -46,7 +46,7 @@ build_with_windows: ...@@ -46,7 +46,7 @@ build_with_windows:
- "call \"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\VC\\Auxiliary\\Build\\vcvars64.bat\"" - "call \"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\VC\\Auxiliary\\Build\\vcvars64.bat\""
- mkdir build - mkdir build
- cd build - cd build
- "\"C:\\Qt\\5.12.3\\msvc2017_64\\bin\\qmake.exe\" ..\\qtdemonrender.pro" - "\"C:\\Qt\\5.12.3\\msvc2017_64\\bin\\qmake.exe\" ..\\qtquick3d.pro"
- "\"C:\\JOM\\JOM.exe\" /J 9" - "\"C:\\JOM\\JOM.exe\" /J 9"
- "\"C:\\JOM\\JOM.exe\" sub-tests /J 9" - "\"C:\\JOM\\JOM.exe\" sub-tests /J 9"
- cd tests - cd tests
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment