From 4310b1134b01b8ed1177ba266f150833506af009 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= <inform@tiker.net>
Date: Wed, 1 Aug 2018 12:23:04 -0400
Subject: [PATCH] Specify gfortran-7 as FC for tests for now, add Py3.6 CI

---
 .gitlab-ci.yml | 38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 543a0f4..17e9fba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,21 @@
+Python 2.6:
+  script:
+  - py_version=2.6
+  - EXTRA_INSTALL="numpy scipy"
+  - export FC=gfortran-7  # https://gitlab.tiker.net/inducer/leap/issues/122
+  - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
+  - ". ./build-and-test-py-project.sh"
+  tags:
+  - python2.6
+  - gfortran
+  except:
+  - tags
+
 Python 2.7:
   script:
   - py_version=2.7
   - EXTRA_INSTALL="numpy scipy"
+  - export FC=gfortran-7  # https://gitlab.tiker.net/inducer/leap/issues/122
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
   - ". ./build-and-test-py-project.sh"
   tags:
@@ -14,6 +28,7 @@ Python 3.5:
   script:
   - py_version=3.5
   - EXTRA_INSTALL="numpy scipy"
+  - export FC=gfortran-7  # https://gitlab.tiker.net/inducer/leap/issues/122
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
   - ". ./build-and-test-py-project.sh"
   tags:
@@ -22,26 +37,27 @@ Python 3.5:
   except:
   - tags
 
-Python 3.6 Examples:
+Python 3.6:
   script:
   - py_version=3.6
-  - EXTRA_INSTALL="numpy scipy matplotlib"
-  - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-py-project-and-run-examples.sh
-  - ". ./build-py-project-and-run-examples.sh"
+  - EXTRA_INSTALL="numpy scipy"
+  - export FC=gfortran-7  # https://gitlab.tiker.net/inducer/leap/issues/122
+  - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
+  - ". ./build-and-test-py-project.sh"
   tags:
   - python3.6
+  - gfortran
   except:
   - tags
 
-Python 2.6:
+Python 3.6 Examples:
   script:
-  - py_version=2.6
-  - EXTRA_INSTALL="numpy scipy"
-  - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
-  - ". ./build-and-test-py-project.sh"
+  - py_version=3.6
+  - EXTRA_INSTALL="numpy scipy matplotlib"
+  - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-py-project-and-run-examples.sh
+  - ". ./build-py-project-and-run-examples.sh"
   tags:
-  - python2.6
-  - gfortran
+  - python3.6
   except:
   - tags
 
-- 
GitLab