Commit b942581d authored by Henderson, Shane's avatar Henderson, Shane
Browse files

Give macOS ci a try

parent 4ce300ef
Loading
Loading
Loading
Loading
+44 −20
Original line number Diff line number Diff line
#.gcc_83_before: &gcc_83_before
#  - if [[ -f "/data/test_gcc/gcc-8.3.0/load_dev_env.sh" ]]; then BASE_DIR="/data/gitlab-runner"; . /data/test_gcc/gcc-8.3.0/load_dev_env.sh; ENV_BASE=/data/test_gcc/gcc-8.3.0; else BASE_DIR="/localhome/gitlab-runner"; . /projects/vera/gcc-8.3.0/load_dev_env.sh; ENV_BASE=/projects/vera/gcc-8.3.0; fi
#  - which gcc
#  - SRC_DIR=`pwd`
#  - BLD_DIR="$SRC_DIR/build"
#
.windows_before: &windows_before
    #Temporary but need conda
    - C:\Users\oxh\Miniconda3\\shell\\condabin\\conda-hook.ps1
    - conda activate 'C:\Users\oxh\Miniconda3'
    - conda activate saline_env
    - $SRC_DIR=$pwd.Path
    - $BLD_DIR="$SRC_DIR/build/$CI_COMMIT_SHORT_SHA"

build_windows:
.nix_before: &nix_before
    - SRC_DIR=`pwd`
    - BLD_DIR="$SRC_DIR/build"

      #.windows_before: &windows_before
      #    #Temporary but need conda
      #    - C:\Users\oxh\Miniconda3\\shell\\condabin\\conda-hook.ps1
      #    - conda activate 'C:\Users\oxh\Miniconda3'
      #    - conda activate saline_env
      #    - $SRC_DIR=$pwd.Path
      #    - $BLD_DIR="$SRC_DIR/build/$CI_COMMIT_SHORT_SHA"

build_macos:
  tags:
    - windows
    - macOS
  script:
    - *windows_before
    - *nix_before
    - echo $CI_BUILDS_DIR
    - echo $SRC_DIR
    - echo $BLD_DIR
    - cmake -S $SRC_DIR -B $BLD_DIR -Dsaline_ENABLE_Fortran=OFF -Dsaline_ENABLE_Python=ON -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE
    - cmake --build $BLD_DIR --target ALL_BUILD --config RELEASE
    - cmake -S $SRC_DIR -B $BLD_DIR -Dsaline_ENABLE_Fortran=OFF -Dsaline_ENABLE_Python=ON
    - cmake --build $BLD_DIR

test windows:
test_macos:
  tags:
    - windows
  script:
    - *windows_before
    - *nix_before
    - echo $SRC_DIR
    - echo $BLD_DIR
    - ls build
    - ctest --build-config RELEASE --test-dir $BLD_DIR
    - ctest --test-dir $BLD_DIR
  needs:
    - job: build_windows
    - job: build_macos

      #build_windows:
      #  tags:
      #    - windows
      #  script:
      #    - *windows_before
      #    - echo $CI_BUILDS_DIR
      #    - echo $SRC_DIR
      #    - echo $BLD_DIR
      #    - cmake -S $SRC_DIR -B $BLD_DIR -Dsaline_ENABLE_Fortran=OFF -Dsaline_ENABLE_Python=ON -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE
      #    - cmake --build $BLD_DIR --target ALL_BUILD --config RELEASE
      #
      #test_windows:
      #  tags:
      #    - windows
      #  script:
      #    - *windows_before
      #    - echo $SRC_DIR
      #    - echo $BLD_DIR
      #    - ls build
      #    - ctest --build-config RELEASE --test-dir $BLD_DIR
      #  needs:
      #    - job: build_windows
    
      #build_linux_gcc83:
      #  tags:
+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ message("Configuring Saline libary tests")
include(FetchContent)
FetchContent_Declare(
  googletest
  GIT_REPOSITORY https://github.com/google/googletest.git
  GIT_REPOSITORY https://code.ornl.gov/scale/code/external/googletest.git
  GIT_TAG release-1.12.1
)
# For Windows: Prevent overriding the parent project's compiler/linker settings