From 4ffd5a689df26111e675ac609178c3aad21bcb75 Mon Sep 17 00:00:00 2001
From: "Elsa Gonsiorowski (Uranus)" <gonsiorowski1@llnl.gov>
Date: Mon, 5 Oct 2020 15:32:10 -0700
Subject: [PATCH 01/14] travis updates

- update doxygen as deploy step (not run on PRs)
- integration testing of CODES for master branch
---
 .travis.yml | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1d22bb933..97c9ebeb2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,10 @@ env:
  - secure: "BbB1KVY0Yb6DJwxdfFDF1PJwSx9euNfNX94oDKftiH8LE0nEzfS6xZc2sBkWTWOThHml9ttBkDIx/NhxEThOjyVcX6uv4kibP6moV5EqxqC+kLoZSEZnVuAdTJfGRKBdzmRp66R5a/GiMzzz/F3+smdVFMb6XR06sPQa5TQZjEc="
 git:
   submodules: false
+branches:
+  only:
+  - master
+  - develop
 before_install:
  - sudo apt-add-repository -y ppa:libreoffice/libreoffice-4-2
  - sudo apt-get update -q
@@ -28,10 +32,12 @@ script:
  - make
  - unset MPICH_CC
  - cd ..
+ - mkdir install
  - mkdir release && cd release
- - MPICH_CC=clang cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Wall -Wextra" -DROSS_BUILD_MODELS=ON ..
+ - MPICH_CC=clang cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_C_FLAGS="-Wall -Wextra" -DROSS_BUILD_MODELS=ON ..
  - make
  - CTEST_OUTPUT_ON_FAILURE=1 make test
+ - make install
  - cd ..
  - mkdir build && cd build
  - MPICH_CC=clang cmake -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Wall -Wextra" -DROSS_BUILD_MODELS=ON ..
@@ -44,11 +50,20 @@ script:
  - make
  - CTEST_OUTPUT_ON_FAILURE=1 make test
  - make coveralls
-branches:
-  only:
-  - master
-  - develop
+ - cd ..
 after_success:
+  # run CODES integration testing for master branch only
+  - if: branch=master
+  - cd ..
+  - git clone --depth=1 --branch=master https://github.com/CODES-org/CODES.git CODES-org/CODES.git
+  - cd CODES-org/CODES
+  - ./prepare.sh
+  - mkdir build && cd build
+  -../configure PKG_CONFIG_PATH=../../ROSS-org/ROSS/install/lib/pkgconfig
+  - make
+  - make tests
+  - make check
+deploy:
   - bash <(curl -s https://codecov.io/bash)
   - ## the following automatically builds the doxygen
   - ## documentation and pushes it to the gh_pages branch

From 7293334b6c4942c6c0dd0fe74c70d1a72b06643e Mon Sep 17 00:00:00 2001
From: "Elsa Gonsiorowski (Uranus)" <gonsiorowski1@llnl.gov>
Date: Mon, 5 Oct 2020 17:06:10 -0700
Subject: [PATCH 02/14] trying again

---
 .travis.yml | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 07abd44f0..6db5c24dc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,9 @@ branches:
   only:
   - master
   - develop
+stages:
+  - name: after_script
+    if: branch=master AND type=push
 before_install:
  - sudo apt-add-repository -y ppa:libreoffice/libreoffice-4-2
  - sudo apt-get update -q
@@ -57,20 +60,19 @@ script:
  - CTEST_OUTPUT_ON_FAILURE=1 make test
  - make coveralls
  - cd ..
+ - cd ..
+ - git clone --depth=1 --branch=master https://github.com/CODES-org/CODES.git CODES-org/CODES.git
+ - cd CODES-org/CODES
+ - ./prepare.sh
+ - mkdir build && cd build
+ -../configure PKG_CONFIG_PATH=../../ROSS-org/ROSS/install/lib/pkgconfig
+ - make
+ - make tests
+ - make check
 after_success:
-  # run CODES integration testing for master branch only
-  - if: branch=master
-  - cd ..
-  - git clone --depth=1 --branch=master https://github.com/CODES-org/CODES.git CODES-org/CODES.git
-  - cd CODES-org/CODES
-  - ./prepare.sh
-  - mkdir build && cd build
-  -../configure PKG_CONFIG_PATH=../../ROSS-org/ROSS/install/lib/pkgconfig
-  - make
-  - make tests
-  - make check
-deploy:
   - bash <(curl -s https://codecov.io/bash)
+  # run CODES integration testing for master branch only
+after_script:
   - ## the following automatically builds the doxygen
   - ## documentation and pushes it to the gh_pages branch
   - ## Shamelessly stolen from http://bit.ly/1H1sawW

From c69d2cfd139577c53242051a261298092b79cca5 Mon Sep 17 00:00:00 2001
From: "Elsa Gonsiorowski (Uranus)" <gonsiorowski1@llnl.gov>
Date: Mon, 5 Oct 2020 17:13:11 -0700
Subject: [PATCH 03/14] explicit stages

---
 .travis.yml | 140 +++++++++++++++++++++++++---------------------------
 1 file changed, 68 insertions(+), 72 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6db5c24dc..58cccaec9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,9 +16,6 @@ branches:
   only:
   - master
   - develop
-stages:
-  - name: after_script
-    if: branch=master AND type=push
 before_install:
  - sudo apt-add-repository -y ppa:libreoffice/libreoffice-4-2
  - sudo apt-get update -q
@@ -28,74 +25,73 @@ before_install:
  - echo $CLOCK_SPEED
  - sh ./conf/travis-install-mpi.sh mpich2
  - mpirun --version
-script:
- - mkdir cxx-build && cd cxx-build
- - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Wall -Wextra" ..
- - export MPICH_CC=clang++
- - make
- - unset MPICH_CC
- - cd ..
- - mkdir install
- - mkdir release && cd release
- - MPICH_CC=clang cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_C_FLAGS="-Wall -Wextra" -DROSS_BUILD_MODELS=ON ..
- - make
- - CTEST_OUTPUT_ON_FAILURE=1 make test
- - make install
- - cd ..
- - mkdir build-gtod && cd build-gtod
- - MPICH_CC=clag cmake -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Wall -Wextra" -DROSS_BUILD_MODELS=ON -DROSS_CLOCK_OVERRIDE=ON ..
- - make
- - CTEST_OUTPUT_ON_FAILURE=1 ctest -R SCHED
- - make coveralls
- - cd ..
- - mkdir build && cd build
- - MPICH_CC=clang cmake -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Wall -Wextra" -DROSS_BUILD_MODELS=ON ..
- - make
- - CTEST_OUTPUT_ON_FAILURE=1 make test
- - make coveralls
- - cd ..
- - mkdir build2 && cd build2
- - MPICH_CC=clang cmake -DAVL_TREE=OFF -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Wall -Wextra" -DROSS_BUILD_MODELS=ON ..
- - make
- - CTEST_OUTPUT_ON_FAILURE=1 make test
- - make coveralls
- - cd ..
- - cd ..
- - git clone --depth=1 --branch=master https://github.com/CODES-org/CODES.git CODES-org/CODES.git
- - cd CODES-org/CODES
- - ./prepare.sh
- - mkdir build && cd build
- -../configure PKG_CONFIG_PATH=../../ROSS-org/ROSS/install/lib/pkgconfig
- - make
- - make tests
- - make check
+stages:
+  - name: tests
+    script:
+      - mkdir cxx-build && cd cxx-build
+      - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Wall -Wextra" ..
+      - export MPICH_CC=clang++
+      - make
+      - unset MPICH_CC
+      - cd ..
+      - mkdir install
+      - mkdir release && cd release
+      - MPICH_CC=clang cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_C_FLAGS="-Wall -Wextra" -DROSS_BUILD_MODELS=ON ..
+      - make
+      - CTEST_OUTPUT_ON_FAILURE=1 make test
+      - make install
+      - cd ..
+      - mkdir build-gtod && cd build-gtod
+      - MPICH_CC=clag cmake -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Wall -Wextra" -DROSS_BUILD_MODELS=ON -DROSS_CLOCK_OVERRIDE=ON ..
+      - make
+      - CTEST_OUTPUT_ON_FAILURE=1 ctest -R SCHED
+      - make coveralls
+      - cd ..
+      - mkdir build && cd build
+      - MPICH_CC=clang cmake -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Wall -Wextra" -DROSS_BUILD_MODELS=ON ..
+      - make
+      - CTEST_OUTPUT_ON_FAILURE=1 make test
+      - make coveralls
+      - cd ..
+      - mkdir build2 && cd build2
+      - MPICH_CC=clang cmake -DAVL_TREE=OFF -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Wall -Wextra" -DROSS_BUILD_MODELS=ON ..
+      - make
+      - CTEST_OUTPUT_ON_FAILURE=1 make test
+      - make coveralls
+      - cd ..
+  - name: integration tests
+    if: branch=master
+    script:
+       - cd ..
+       - git clone --depth=1 --branch=master https://github.com/CODES-org/CODES.git CODES-org/CODES.git
+       - cd CODES-org/CODES
+       - ./prepare.sh
+       - mkdir build && cd build
+       -../configure PKG_CONFIG_PATH=../../ROSS-org/ROSS/install/lib/pkgconfig
+       - make
+       - make tests
+       - make check
+  - name: deploy
+    if: branch=master AND type=push
+    script:
+      - # using travis' private key before this script was run.
+      - git config --global user.name "ROSS bot"
+      - git config --global user.email ross.gh.robot@gmail.com
+      -
+      - # clone the whole repo again, but switch to gh_pages branch
+      - git clone -b master --single-branch https://github.com/ross-org/ross-org.github.io
+      - cd ross-org.github.io
+      - git clone -b master --single-branch https://github.com/ross-org/ROSS
+      - cd ROSS
+      - mkdir build && cd build
+      - cmake -DROSS_BUILD_DOXYGEN=ON -DDOXYGEN_CALLER_GRAPHS=ON -DDOXYGEN_CALL_GRAPHS=ON ..
+      - make apidoc
+      - cd ../..
+      - git rm -r ROSS-docs
+      - mkdir -p ROSS-docs/docs
+      - mv ROSS/build/docs/html ROSS-docs/docs
+      - git add ROSS-docs
+      - git commit -m "Automatic doxygen build."
+      - git push https://${GH_TOKEN}@github.com/ROSS-org/ross-org.github.io master
 after_success:
   - bash <(curl -s https://codecov.io/bash)
-  # run CODES integration testing for master branch only
-after_script:
-  - ## the following automatically builds the doxygen
-  - ## documentation and pushes it to the gh_pages branch
-  - ## Shamelessly stolen from http://bit.ly/1H1sawW
-  -
-  - # First, set up credentials using the environment variables
-  - # GIT_NAME, GIT_EMAIL and GH_TOKEN. These were passed
-  - # encrypted to travis and should have been decrypted
-  - # using travis' private key before this script was run.
-  - git config --global user.name "ROSS bot"
-  - git config --global user.email ross.gh.robot@gmail.com
-  -
-  - # clone the whole repo again, but switch to gh_pages branch
-  - git clone -b master --single-branch https://github.com/ross-org/ross-org.github.io
-  - cd ross-org.github.io
-  - git clone -b master --single-branch https://github.com/ross-org/ROSS
-  - cd ROSS
-  - mkdir build && cd build
-  - cmake -DROSS_BUILD_DOXYGEN=ON -DDOXYGEN_CALLER_GRAPHS=ON -DDOXYGEN_CALL_GRAPHS=ON ..
-  - make apidoc
-  - cd ../..
-  - git rm -r ROSS-docs
-  - mkdir -p ROSS-docs/docs
-  - mv ROSS/build/docs/html ROSS-docs/docs
-  - git add ROSS-docs
-  - git commit -m "Automatic doxygen build."
-  - git push https://${GH_TOKEN}@github.com/ROSS-org/ross-org.github.io master

From 4aa32544446c1442b4b59eecf9548a9ad92a83ce Mon Sep 17 00:00:00 2001
From: "Elsa Gonsiorowski (Uranus)" <gonsiorowski1@llnl.gov>
Date: Tue, 6 Oct 2020 09:51:18 -0700
Subject: [PATCH 04/14] travis: single stage, cut out if not on master branch

---
 .travis.yml | 127 ++++++++++++++++++++++++----------------------------
 1 file changed, 59 insertions(+), 68 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 58cccaec9..ee87e6bf4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,73 +25,64 @@ before_install:
  - echo $CLOCK_SPEED
  - sh ./conf/travis-install-mpi.sh mpich2
  - mpirun --version
-stages:
-  - name: tests
-    script:
-      - mkdir cxx-build && cd cxx-build
-      - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Wall -Wextra" ..
-      - export MPICH_CC=clang++
-      - make
-      - unset MPICH_CC
-      - cd ..
-      - mkdir install
-      - mkdir release && cd release
-      - MPICH_CC=clang cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_C_FLAGS="-Wall -Wextra" -DROSS_BUILD_MODELS=ON ..
-      - make
-      - CTEST_OUTPUT_ON_FAILURE=1 make test
-      - make install
-      - cd ..
-      - mkdir build-gtod && cd build-gtod
-      - MPICH_CC=clag cmake -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Wall -Wextra" -DROSS_BUILD_MODELS=ON -DROSS_CLOCK_OVERRIDE=ON ..
-      - make
-      - CTEST_OUTPUT_ON_FAILURE=1 ctest -R SCHED
-      - make coveralls
-      - cd ..
-      - mkdir build && cd build
-      - MPICH_CC=clang cmake -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Wall -Wextra" -DROSS_BUILD_MODELS=ON ..
-      - make
-      - CTEST_OUTPUT_ON_FAILURE=1 make test
-      - make coveralls
-      - cd ..
-      - mkdir build2 && cd build2
-      - MPICH_CC=clang cmake -DAVL_TREE=OFF -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Wall -Wextra" -DROSS_BUILD_MODELS=ON ..
-      - make
-      - CTEST_OUTPUT_ON_FAILURE=1 make test
-      - make coveralls
-      - cd ..
-  - name: integration tests
-    if: branch=master
-    script:
-       - cd ..
-       - git clone --depth=1 --branch=master https://github.com/CODES-org/CODES.git CODES-org/CODES.git
-       - cd CODES-org/CODES
-       - ./prepare.sh
-       - mkdir build && cd build
-       -../configure PKG_CONFIG_PATH=../../ROSS-org/ROSS/install/lib/pkgconfig
-       - make
-       - make tests
-       - make check
-  - name: deploy
-    if: branch=master AND type=push
-    script:
-      - # using travis' private key before this script was run.
-      - git config --global user.name "ROSS bot"
-      - git config --global user.email ross.gh.robot@gmail.com
-      -
-      - # clone the whole repo again, but switch to gh_pages branch
-      - git clone -b master --single-branch https://github.com/ross-org/ross-org.github.io
-      - cd ross-org.github.io
-      - git clone -b master --single-branch https://github.com/ross-org/ROSS
-      - cd ROSS
-      - mkdir build && cd build
-      - cmake -DROSS_BUILD_DOXYGEN=ON -DDOXYGEN_CALLER_GRAPHS=ON -DDOXYGEN_CALL_GRAPHS=ON ..
-      - make apidoc
-      - cd ../..
-      - git rm -r ROSS-docs
-      - mkdir -p ROSS-docs/docs
-      - mv ROSS/build/docs/html ROSS-docs/docs
-      - git add ROSS-docs
-      - git commit -m "Automatic doxygen build."
-      - git push https://${GH_TOKEN}@github.com/ROSS-org/ross-org.github.io master
+script:
+  - mkdir cxx-build && cd cxx-build
+  - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Wall -Wextra" ..
+  - export MPICH_CC=clang++
+  - make
+  - unset MPICH_CC
+  - cd ..
+  - mkdir install
+  - mkdir release && cd release
+  - MPICH_CC=clang cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_C_FLAGS="-Wall -Wextra" -DROSS_BUILD_MODELS=ON ..
+  - make
+  - CTEST_OUTPUT_ON_FAILURE=1 make test
+  - make install
+  - cd ..
+  - mkdir build-gtod && cd build-gtod
+  - MPICH_CC=clag cmake -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Wall -Wextra" -DROSS_BUILD_MODELS=ON -DROSS_CLOCK_OVERRIDE=ON ..
+  - make
+  - CTEST_OUTPUT_ON_FAILURE=1 ctest -R SCHED
+  - make coveralls
+  - cd ..
+  - mkdir build && cd build
+  - MPICH_CC=clang cmake -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Wall -Wextra" -DROSS_BUILD_MODELS=ON ..
+  - make
+  - CTEST_OUTPUT_ON_FAILURE=1 make test
+  - make coveralls
+  - cd ..
+  - mkdir build2 && cd build2
+  - MPICH_CC=clang cmake -DAVL_TREE=OFF -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Wall -Wextra" -DROSS_BUILD_MODELS=ON ..
+  - make
+  - CTEST_OUTPUT_ON_FAILURE=1 make test
+  - make coveralls
+  - cd ..
+  - # only run CODES integration for master branch
+  - if [ $TRAVIS_BRANCH != "master" ]; then
+  -   return
+  - fi
+  - cd ..
+  - git clone --depth=1 --branch=master https://github.com/CODES-org/CODES.git CODES-org/CODES.git
+  - cd CODES-org/CODES
+  - ./prepare.sh
+  - mkdir build && cd build
+  -../configure PKG_CONFIG_PATH=../../ROSS-org/ROSS/install/lib/pkgconfig
+  - make
+  - make tests
+  - make check
+  - # prep for docs deployment
+  - cd ../../../ROSS-org/ROSS
+  - mkdir doc-build && cd doc-build
+  - cmake -DROSS_BUILD_DOXYGEN=ON -DDOXYGEN_CALLER_GRAPHS=ON -DDOXYGEN_CALL_GRAPHS=ON ..
+  - make apidoc
 after_success:
   - bash <(curl -s https://codecov.io/bash)
+deploy:
+  provider: pages: git
+  edge: true
+  token: $GH_TOKEN
+  repo: ross-org/ross-org.github.io
+  branch: master
+  name: ROSS bot
+  email: ross.gh.robot@gmail.com
+  local_dir: docs/html

From 2c68b0d987512f3854be6333cb684eee1bf87af7 Mon Sep 17 00:00:00 2001
From: "Elsa Gonsiorowski (Uranus)" <gonsiorowski1@llnl.gov>
Date: Tue, 6 Oct 2020 09:57:23 -0700
Subject: [PATCH 05/14] travis deploy strategy

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ee87e6bf4..e2ca8d54d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -78,7 +78,8 @@ script:
 after_success:
   - bash <(curl -s https://codecov.io/bash)
 deploy:
-  provider: pages: git
+  provider: pages
+  strategy: git
   edge: true
   token: $GH_TOKEN
   repo: ross-org/ross-org.github.io

From 68e0afb077dc3684f7af82e5c2f15bf37093b809 Mon Sep 17 00:00:00 2001
From: "Elsa Gonsiorowski (Uranus)" <gonsiorowski1@llnl.gov>
Date: Tue, 6 Oct 2020 10:05:23 -0700
Subject: [PATCH 06/14] maybe whitespace matters?

---
 .travis.yml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e2ca8d54d..614e68c77 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,14 +17,14 @@ branches:
   - master
   - develop
 before_install:
- - sudo apt-add-repository -y ppa:libreoffice/libreoffice-4-2
- - sudo apt-get update -q
- - sudo apt-get install -y -qq lcov curl doxygen graphviz
- - lscpu
- - CLOCK_SPEED=`lscpu | grep "MHz" | awk '{print $3*1000*1000}'`
- - echo $CLOCK_SPEED
- - sh ./conf/travis-install-mpi.sh mpich2
- - mpirun --version
+  - sudo apt-add-repository -y ppa:libreoffice/libreoffice-4-2
+  - sudo apt-get update -q
+  - sudo apt-get install -y -qq lcov curl doxygen graphviz
+  - lscpu
+  - CLOCK_SPEED=`lscpu | grep "MHz" | awk '{print $3*1000*1000}'`
+  - echo $CLOCK_SPEED
+  - sh ./conf/travis-install-mpi.sh mpich2
+  - mpirun --version
 script:
   - mkdir cxx-build && cd cxx-build
   - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Wall -Wextra" ..
@@ -58,9 +58,7 @@ script:
   - make coveralls
   - cd ..
   - # only run CODES integration for master branch
-  - if [ $TRAVIS_BRANCH != "master" ]; then
-  -   return
-  - fi
+  - if [ $TRAVIS_BRANCH != "master" ]; then return; fi
   - cd ..
   - git clone --depth=1 --branch=master https://github.com/CODES-org/CODES.git CODES-org/CODES.git
   - cd CODES-org/CODES

From bcdfa65463dde63811f8656e0d6937577e5104ca Mon Sep 17 00:00:00 2001
From: "Elsa Gonsiorowski (Uranus)" <gonsiorowski1@llnl.gov>
Date: Tue, 6 Oct 2020 10:15:04 -0700
Subject: [PATCH 07/14] small typo?

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 614e68c77..aa6689183 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,7 +64,7 @@ script:
   - cd CODES-org/CODES
   - ./prepare.sh
   - mkdir build && cd build
-  -../configure PKG_CONFIG_PATH=../../ROSS-org/ROSS/install/lib/pkgconfig
+  - ../configure PKG_CONFIG_PATH=../../ROSS-org/ROSS/install/lib/pkgconfig
   - make
   - make tests
   - make check

From 7faddc9fe51e1956355a110e58c171ea50e9f154 Mon Sep 17 00:00:00 2001
From: "Elsa Gonsiorowski (Uranus)" <gonsiorowski1@llnl.gov>
Date: Tue, 6 Oct 2020 10:22:51 -0700
Subject: [PATCH 08/14] before deploy step to setup docs

---
 .travis.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index aa6689183..5a11e8259 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -68,13 +68,19 @@ script:
   - make
   - make tests
   - make check
-  - # prep for docs deployment
-  - cd ../../../ROSS-org/ROSS
+  - cd ../../..
+after_success:
+  - bash <(curl -s https://codecov.io/bash)
+before_deploy:
+  - cd ROSS-org/ROSS
+  - git clone -b master --single-branch https://github.com/ROSS-org/ross-org.github.io.git
   - mkdir doc-build && cd doc-build
   - cmake -DROSS_BUILD_DOXYGEN=ON -DDOXYGEN_CALLER_GRAPHS=ON -DDOXYGEN_CALL_GRAPHS=ON ..
   - make apidoc
-after_success:
-  - bash <(curl -s https://codecov.io/bash)
+  - cd ../
+  - rm -r ross-org.github.io/ROSS-docs/docs
+  - mv doc-build/docs/html ross-org.github.io/ROSS-docs/
+  - cd ross-org.github.io
 deploy:
   provider: pages
   strategy: git
@@ -84,4 +90,3 @@ deploy:
   branch: master
   name: ROSS bot
   email: ross.gh.robot@gmail.com
-  local_dir: docs/html

From 13b1b54e127f339eaf5f6d2e66b426f513129470 Mon Sep 17 00:00:00 2001
From: "Elsa Gonsiorowski (Uranus)" <gonsiorowski1@llnl.gov>
Date: Tue, 6 Oct 2020 10:30:22 -0700
Subject: [PATCH 09/14] typos

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5a11e8259..76e161a4a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,7 +60,7 @@ script:
   - # only run CODES integration for master branch
   - if [ $TRAVIS_BRANCH != "master" ]; then return; fi
   - cd ..
-  - git clone --depth=1 --branch=master https://github.com/CODES-org/CODES.git CODES-org/CODES.git
+  - git clone --depth=1 --branch=master https://github.com/CODES-org/CODES.git CODES-org/CODES
   - cd CODES-org/CODES
   - ./prepare.sh
   - mkdir build && cd build

From 74909e929d89c74e6c0f8f375c7dc9f5dcd674c7 Mon Sep 17 00:00:00 2001
From: "Elsa Gonsiorowski (Uranus)" <gonsiorowski1@llnl.gov>
Date: Tue, 6 Oct 2020 10:56:13 -0700
Subject: [PATCH 10/14] cleaning up travis

- C++ test wasn't doing anything
- MPICH_CC variable wasn't doing anything
---
 .travis.yml | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 76e161a4a..e50db99e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,33 +26,27 @@ before_install:
   - sh ./conf/travis-install-mpi.sh mpich2
   - mpirun --version
 script:
-  - mkdir cxx-build && cd cxx-build
-  - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Wall -Wextra" ..
-  - export MPICH_CC=clang++
-  - make
-  - unset MPICH_CC
-  - cd ..
   - mkdir install
   - mkdir release && cd release
-  - MPICH_CC=clang cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_C_FLAGS="-Wall -Wextra" -DROSS_BUILD_MODELS=ON ..
+  - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_C_FLAGS="-Wall -Wextra" -DROSS_BUILD_MODELS=ON ..
   - make
   - CTEST_OUTPUT_ON_FAILURE=1 make test
   - make install
   - cd ..
   - mkdir build-gtod && cd build-gtod
-  - MPICH_CC=clag cmake -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Wall -Wextra" -DROSS_BUILD_MODELS=ON -DROSS_CLOCK_OVERRIDE=ON ..
+  - cmake -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Wall -Wextra" -DROSS_BUILD_MODELS=ON -DROSS_CLOCK_OVERRIDE=ON ..
   - make
   - CTEST_OUTPUT_ON_FAILURE=1 ctest -R SCHED
   - make coveralls
   - cd ..
   - mkdir build && cd build
-  - MPICH_CC=clang cmake -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Wall -Wextra" -DROSS_BUILD_MODELS=ON ..
+  - cmake -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Wall -Wextra" -DROSS_BUILD_MODELS=ON ..
   - make
   - CTEST_OUTPUT_ON_FAILURE=1 make test
   - make coveralls
   - cd ..
   - mkdir build2 && cd build2
-  - MPICH_CC=clang cmake -DAVL_TREE=OFF -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Wall -Wextra" -DROSS_BUILD_MODELS=ON ..
+  - cmake -DAVL_TREE=OFF -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Wall -Wextra" -DROSS_BUILD_MODELS=ON ..
   - make
   - CTEST_OUTPUT_ON_FAILURE=1 make test
   - make coveralls
@@ -64,7 +58,7 @@ script:
   - cd CODES-org/CODES
   - ./prepare.sh
   - mkdir build && cd build
-  - ../configure PKG_CONFIG_PATH=../../ROSS-org/ROSS/install/lib/pkgconfig
+  - CC=mpicc ../configure PKG_CONFIG_PATH=../../ROSS-org/ROSS/install/lib/pkgconfig
   - make
   - make tests
   - make check

From cab844b7177820c40076c4e1bf1d593647050cfa Mon Sep 17 00:00:00 2001
From: "Elsa Gonsiorowski (Uranus)" <gonsiorowski1@llnl.gov>
Date: Tue, 6 Oct 2020 11:06:44 -0700
Subject: [PATCH 11/14] CODES travis path to ROSS install

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e50db99e4..7e3f7426b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,7 +58,7 @@ script:
   - cd CODES-org/CODES
   - ./prepare.sh
   - mkdir build && cd build
-  - CC=mpicc ../configure PKG_CONFIG_PATH=../../ROSS-org/ROSS/install/lib/pkgconfig
+  - CC=mpicc ../configure PKG_CONFIG_PATH=/home/travis/build/ROSS-org/ROSS/install/lib/pkgconfig
   - make
   - make tests
   - make check

From 1341fee5a685434696555f2cf24d87f390f6ae74 Mon Sep 17 00:00:00 2001
From: "Elsa Gonsiorowski (Uranus)" <gonsiorowski1@llnl.gov>
Date: Tue, 6 Oct 2020 11:20:28 -0700
Subject: [PATCH 12/14] i should think about converting CODES to cmake

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7e3f7426b..ee7f5dc80 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,7 +59,7 @@ script:
   - ./prepare.sh
   - mkdir build && cd build
   - CC=mpicc ../configure PKG_CONFIG_PATH=/home/travis/build/ROSS-org/ROSS/install/lib/pkgconfig
-  - make
+  - CC=mpicc make
   - make tests
   - make check
   - cd ../../..

From 7ec3c02af14dabe49a85fedcb971a8376bd5dc58 Mon Sep 17 00:00:00 2001
From: "Elsa Gonsiorowski (Uranus)" <gonsiorowski1@llnl.gov>
Date: Tue, 6 Oct 2020 11:33:50 -0700
Subject: [PATCH 13/14] codes needs CXX

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ee7f5dc80..b98a394c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,8 +58,8 @@ script:
   - cd CODES-org/CODES
   - ./prepare.sh
   - mkdir build && cd build
-  - CC=mpicc ../configure PKG_CONFIG_PATH=/home/travis/build/ROSS-org/ROSS/install/lib/pkgconfig
-  - CC=mpicc make
+  - CXX=mpicxx CC=mpicc ../configure PKG_CONFIG_PATH=/home/travis/build/ROSS-org/ROSS/install/lib/pkgconfig
+  - make
   - make tests
   - make check
   - cd ../../..

From c56dd853257f0b4989e28b3f4537df7f548b3e3b Mon Sep 17 00:00:00 2001
From: "Elsa Gonsiorowski (Uranus)" <gonsiorowski1@llnl.gov>
Date: Tue, 6 Oct 2020 12:16:23 -0700
Subject: [PATCH 14/14] faster deploy

---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b98a394c9..6756aa019 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -67,18 +67,19 @@ after_success:
   - bash <(curl -s https://codecov.io/bash)
 before_deploy:
   - cd ROSS-org/ROSS
-  - git clone -b master --single-branch https://github.com/ROSS-org/ross-org.github.io.git
+  - git clone -b master --single-branch --depth=1 https://github.com/ROSS-org/ross-org.github.io.git
   - mkdir doc-build && cd doc-build
   - cmake -DROSS_BUILD_DOXYGEN=ON -DDOXYGEN_CALLER_GRAPHS=ON -DDOXYGEN_CALL_GRAPHS=ON ..
   - make apidoc
   - cd ../
   - rm -r ross-org.github.io/ROSS-docs/docs
-  - mv doc-build/docs/html ross-org.github.io/ROSS-docs/
+  - mv doc-build/docs ross-org.github.io/ROSS-docs/
   - cd ross-org.github.io
 deploy:
   provider: pages
   strategy: git
   edge: true
+  skip_cleanup: true
   token: $GH_TOKEN
   repo: ross-org/ross-org.github.io
   branch: master