Merge branch 'dev/gfdl' of github.com:NOAA-GFDL/MOM6 into dev/gfdl

NOAA-GFDL · Jun 13, 2017 · 144daae · 144daae
2 parents e1aed13 + ebeb5fa
commit 144daae
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -31,8 +31,8 @@ setup:
     - ln -sf $MOM6_SRC/{config_src,src,pkg} .
     - test -d tests || (git clone --recursive http://gitlab.gfdl.noaa.gov/ogrp/Gaea_c3-stats-MOM6-examples.git tests)
     - cd tests
-    - git checkout dev/gfdl
-    - git checkout . && git pull
+    - git checkout . && git checkout dev/gfdl
+    - git pull
     - git status
     - bash Gitlab/before_script.sh
     - (cd MOM6-examples/src/mkmf && git pull https://github.com/adcroft/mkmf.git add_coverage_mode)