Skip to content
Snippets Groups Projects
Commit f71343d4 authored by Dilawar Singh's avatar Dilawar Singh
Browse files

Merge commit '04170cb4'

Conflicts:
	moose-core/CMakeLists.txt
	moose-core/VERSION
parents 028b5cfc 04170cb4
No related branches found
No related tags found
No related merge requests found
...@@ -20,9 +20,9 @@ env: ...@@ -20,9 +20,9 @@ env:
- CTEST_MODEL=Nightly - CTEST_MODEL=Nightly
cache: apt cache: apt
#matrix: matrix:
# allow_failures: allow_failures:
# - clang - clang
before_script: before_script:
- sudo apt-get install -qq libxml2-dev libbz2-dev - sudo apt-get install -qq libxml2-dev libbz2-dev
...@@ -42,7 +42,9 @@ install: ...@@ -42,7 +42,9 @@ install:
- echo "nothing to do here" - echo "nothing to do here"
script: script:
- # First test is normal make scripts. (outdated). - First check no python3 incompatible file.
- python3 -m compileall -q .
- # Then run the old make scripts
- make - make
- ## CMAKE based flow - ## CMAKE based flow
- mkdir -p _GSL_BUILD && cd _GSL_BUILD && cmake -DDEBUG=ON -DPYTHON_EXECUTABLE=/usr/bin/python .. - mkdir -p _GSL_BUILD && cd _GSL_BUILD && cmake -DDEBUG=ON -DPYTHON_EXECUTABLE=/usr/bin/python ..
......
3.1.1-72-g42f15c9 3.1.0-155-gb7f1834
\ No newline at end of file
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