Skip to content
Snippets Groups Projects
Commit fdf97608 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

cleanup

parent 41f2d74d
No related branches found
No related tags found
No related merge requests found
...@@ -23,7 +23,7 @@ linux64_ci: ...@@ -23,7 +23,7 @@ linux64_ci:
- mkdir build - mkdir build
- cd build - cd build
- export CXXFLAGS=-Werror - export CXXFLAGS=-Werror
- cmake ${EXTRA_OPTION} .. - cmake ..
- make -j 8 - make -j 8
- ctest -j 8 --output-on-failure - ctest -j 8 --output-on-failure
- valgrind --leak-check=full --error-exitcode=1 ./gmsh ../tutorial/t5.geo -3 - valgrind --leak-check=full --error-exitcode=1 ./gmsh ../tutorial/t5.geo -3
...@@ -38,7 +38,7 @@ linux64_compatibility_ci: ...@@ -38,7 +38,7 @@ linux64_compatibility_ci:
script: script:
- mkdir build - mkdir build
- cd build - cd build
- cmake -DDEFAULT=0 ${EXTRA_OPTION} .. - cmake -DDEFAULT=0 ..
- make -j 8 - make -j 8
- cmake -DENABLE_PARSER=1 .. - cmake -DENABLE_PARSER=1 ..
- make -j 8 - make -j 8
...@@ -60,7 +60,7 @@ windows64_ci: ...@@ -60,7 +60,7 @@ windows64_ci:
script: script:
- md build - md build
- cd build - cd build
- bash -c "/usr/bin/cmake -DCMAKE_PREFIX_PATH='/usr/local/opencascade;/usr/local;/usr/x86_64-w64-mingw32/sys-root/mingw' -DCMAKE_C_COMPILER=/usr/bin/x86_64-w64-mingw32-gcc.exe -DCMAKE_CXX_COMPILER=/usr/bin/x86_64-w64-mingw32-g++.exe -DCMAKE_Fortran_COMPILER=/usr/bin/x86_64-w64-mingw32-gfortran.exe -DCMAKE_RC_COMPILER=/usr/bin/x86_64-w64-mingw32-windres.exe -DBLAS_LAPACK_LIBRARIES='/usr/local/lib/libopenblas.a;-lgfortran;-lquadmath' -DENABLE_OS_SPECIFIC_INSTALL=1 ${EXTRA_OPTION} .." - bash -c "/usr/bin/cmake -DCMAKE_PREFIX_PATH='/usr/local/opencascade;/usr/local;/usr/x86_64-w64-mingw32/sys-root/mingw' -DCMAKE_C_COMPILER=/usr/bin/x86_64-w64-mingw32-gcc.exe -DCMAKE_CXX_COMPILER=/usr/bin/x86_64-w64-mingw32-g++.exe -DCMAKE_Fortran_COMPILER=/usr/bin/x86_64-w64-mingw32-gfortran.exe -DCMAKE_RC_COMPILER=/usr/bin/x86_64-w64-mingw32-windres.exe -DBLAS_LAPACK_LIBRARIES='/usr/local/lib/libopenblas.a;-lgfortran;-lquadmath' -DENABLE_OS_SPECIFIC_INSTALL=1 .."
- bash -c "/usr/bin/make -j 8" - bash -c "/usr/bin/make -j 8"
- bash -c "/usr/bin/ctest -j 8 --output-on-failure" - bash -c "/usr/bin/ctest -j 8 --output-on-failure"
tags: tags:
...@@ -73,7 +73,7 @@ windows64_msvc_ci: ...@@ -73,7 +73,7 @@ windows64_msvc_ci:
script: script:
- md build - md build
- cd build - cd build
- cmake -DENABLE_BLAS_LAPACK=0 -DENABLE_HXT=0 ${EXTRA_OPTION} .. - cmake -DENABLE_BLAS_LAPACK=0 -DENABLE_HXT=0 ..
- msbuild package.vcxproj - msbuild package.vcxproj
tags: tags:
- windows64 - windows64
...@@ -389,7 +389,7 @@ doc_official_snapshot: ...@@ -389,7 +389,7 @@ doc_official_snapshot:
script: script:
- mkdir build_doc - mkdir build_doc
- cd build_doc - cd build_doc
- cmake ${EXTRA_OPTION} .. - cmake ..
- make doc - make doc
- scp gmsh-*-doc.tgz geuzaine@gmsh.info:.wwwgmsh/doc.tgz - scp gmsh-*-doc.tgz geuzaine@gmsh.info:.wwwgmsh/doc.tgz
- ssh geuzaine@gmsh.info "cd .wwwgmsh/dev && tar zxvf ../doc.tgz" - ssh geuzaine@gmsh.info "cd .wwwgmsh/dev && tar zxvf ../doc.tgz"
...@@ -402,15 +402,13 @@ doc_official_snapshot: ...@@ -402,15 +402,13 @@ doc_official_snapshot:
doc_official_release: doc_official_release:
stage: .post stage: .post
image: onelab/ubuntu20.04 image: onelab/ubuntu20.04
variables:
EXTRA_OPTION: "-DGMSH_RELEASE=1"
only: only:
- master@gmsh/gmsh - master@gmsh/gmsh
<<: *ssh_config <<: *ssh_config
script: script:
- mkdir build_doc - mkdir build_doc
- cd build_doc - cd build_doc
- cmake ${EXTRA_OPTION} .. - cmake -DGMSH_RELEASE=1 ..
- make doc - make doc
- scp gmsh-*-doc.tgz geuzaine@gmsh.info:.wwwgmsh/doc.tgz - scp gmsh-*-doc.tgz geuzaine@gmsh.info:.wwwgmsh/doc.tgz
- ssh geuzaine@gmsh.info "cd .wwwgmsh && tar zxvf doc.tgz" - ssh geuzaine@gmsh.info "cd .wwwgmsh && tar zxvf doc.tgz"
...@@ -428,8 +426,6 @@ doc_official_release: ...@@ -428,8 +426,6 @@ doc_official_release:
pypi_official_release: pypi_official_release:
stage: .post stage: .post
image: onelab/ubuntu20.04 image: onelab/ubuntu20.04
variables:
EXTRA_OPTION: "-DGMSH_RELEASE=1"
only: only:
- master@gmsh/gmsh - master@gmsh/gmsh
before_script: before_script:
...@@ -439,7 +435,10 @@ pypi_official_release: ...@@ -439,7 +435,10 @@ pypi_official_release:
- echo "username = __token__" >> ~/.pypirc - echo "username = __token__" >> ~/.pypirc
- echo "password = $PYPI_TOKEN" >> ~/.pypirc - echo "password = $PYPI_TOKEN" >> ~/.pypirc
script: script:
- cd utils/pypi/gmsh - mkdir build_pypi
- cd build_pypi
- cmake -DGMSH_RELEASE=1 ..
- cd ../utils/pypi/gmsh
- python3 setup.py sdist - python3 setup.py sdist
- twine upload dist/* - twine upload dist/*
- cd ../gmsh-dev - cd ../gmsh-dev
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment