Commit 9d292795 authored by Henderson, Shane's avatar Henderson, Shane
Browse files

Merge branch 'runnerUpdate' into 'master' 

Update Spack environment used

See merge request https://code.ornl.gov/futility/Futility/-/merge_requests/406
parents c0650690 4cca1014

.gitlab-ci.yml

+6 −8
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@ build_serial_debug: 
    - vm

  script:

    - . /data/spack/share/spack/setup-env.sh

    - spack env activate vera44

    - spack env activate vera_gcc85_mpich343

    - build_scripts/build_with_spack.sh

      -DPYTHON_EXECUTABLE=/usr/bin/python2.7

      -DPYTHON_EXECUTABLE=`which python`

      -DCMAKE_BUILD_TYPE:STRING="DEBUG"

      -DTPL_ENABLE_MPI:BOOL=OFF

      -S $CI_PROJECT_DIR -B $CI_PROJECT_DIR/build
@@ -44,9 +44,9 @@ build_mpi_debug: 
    - vm

  script:

    - . /data/spack/share/spack/setup-env.sh

    - spack env activate vera44

    - spack env activate vera_gcc85_mpich343

    - build_scripts/build_with_spack.sh

      -DPYTHON_EXECUTABLE=/usr/bin/python2.7

      -DPYTHON_EXECUTABLE=`which python`

      -DCMAKE_BUILD_TYPE:STRING="DEBUG"

      -DFutility_FPE_TRAP:BOOL=ON

      -DTPL_ENABLE_MPI:BOOL=ON
@@ -73,13 +73,11 @@ build_mpi_release: 
  tags:

    - linux

    - vm

  rules:

    - when: manual

  script:

    - . /data/spack/share/spack/setup-env.sh

    - spack env activate vera44

    - spack env activate vera_gcc85_mpich343

    - build_scripts/build_with_spack.sh

      -DPYTHON_EXECUTABLE=/usr/bin/python2.7

      -DPYTHON_EXECUTABLE=`which python`

      -DCMAKE_BUILD_TYPE:STRING="RELEASE"

      -DTPL_ENABLE_MPI:BOOL=ON

      -DCMAKE_Fortran_COMPILER=`which mpif90`