diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bc59b1ed13..c35dace532 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,6 +26,8 @@ trigger cvf: variables: SPACK_PACKAGE: nmodl SPACK_PACKAGE_SPEC: ~legacy-unit+python + SPACK_EXTRA_MODULES: llvm + SPACK_INSTALL_EXTRA_FLAGS: -v spack_setup: extends: .spack_setup_ccache @@ -41,13 +43,15 @@ build:intel: - .spack_nmodl variables: SPACK_PACKAGE_COMPILER: intel + # intel build is slow with release + SPACK_PACKAGE_SPEC: ~legacy-unit+python build_type=Debug -build:nvhpc: +build:gcc: extends: - .spack_build - .spack_nmodl variables: - SPACK_PACKAGE_COMPILER: nvhpc + SPACK_PACKAGE_COMPILER: gcc SPACK_PACKAGE_DEPENDENCIES: ^bison%gcc^flex%gcc^py-jinja2%gcc^py-sympy%gcc^py-pyyaml%gcc .nmodl_tests: @@ -61,8 +65,8 @@ test:intel: - .nmodl_tests needs: ["build:intel"] -test:nvhpc: +test:gcc: extends: - .ctest - .nmodl_tests - needs: ["build:nvhpc"] + needs: ["build:gcc"]