circleci: Add integer-simple build target
authorBen Gamari <ben@smart-cactus.org>
Tue, 11 Dec 2018 18:01:00 +0000 (13:01 -0500)
committerBen Gamari <ben@smart-cactus.org>
Tue, 11 Dec 2018 18:01:00 +0000 (13:01 -0500)
Fixes #15915.

.circleci/config.yml
.circleci/prepare-system.sh

index 8eb1362..5bf0336 100644 (file)
@@ -182,6 +182,29 @@ jobs:
       - *store_test_artifacts
       - *push_perf_note
 
+  "validate-x86_64-linux-deb9-integer-simple":
+    resource_class: xlarge
+    docker:
+      - image: ghcci/x86_64-linux-deb9:0.1
+    environment:
+      <<: *buildenv
+      INTEGER_LIBRARY: integer-simple
+      GHC_COLLECTOR_FLAVOR: x86_64-linux-deb9
+    steps:
+      - checkout
+      - *set_git_identity
+      - *prepare
+      - *submodules
+      - *boot
+      - *configure_unix
+      - *make
+      - *bindist
+      - *store_bindist
+      - *test
+      - *store_test_results
+      - *store_test_artifacts
+      - *push_perf_note
+
   "validate-x86_64-linux-deb9":
     resource_class: xlarge
     docker:
@@ -189,7 +212,7 @@ jobs:
     environment:
       <<: *buildenv
       GHC_COLLECTOR_FLAVOR: x86_64-linux-deb9
-      TEST_ENV: x86_64-linux
+      TEST_ENV: x86_64-linux-deb9
     steps:
       - checkout
       - *set_git_identity
@@ -441,6 +464,8 @@ workflows:
     - validate-x86_64-linux-deb8-unreg
     - validate-x86_64-linux-deb8-llvm
     - validate-x86_64-linux-deb8-debug
+    - validate-x86_64-linux-deb9
+    - validate-x86_64-linux-deb9-integer-simple
     - slow-validate-x86_64-linux-deb8
 
 notify:
index 9a16c01..d424243 100755 (executable)
@@ -11,6 +11,7 @@ hackage_index_state="@1522046735"
 
 if [[ -z ${BUILD_SPHINX_HTML:-} ]]; then BUILD_SPHINX_HTML=YES; fi
 if [[ -z ${BUILD_SPHINX_PDF:-} ]]; then BUILD_SPHINX_PDF=YES; fi
+if [[ -z ${INTEGER_LIBRARY:-} ]]; then INTEGER_LIBRARY=integer-gmp; fi
 
 cat > mk/build.mk <<EOF
 V=1
@@ -20,6 +21,7 @@ HSCOLOUR_SRCS=YES
 BUILD_SPHINX_HTML=$BUILD_SPHINX_HTML
 BUILD_SPHINX_PDF=$BUILD_SPHINX_PDF
 BeConservative=YES
+INTEGER_LIBRARY=$INTEGER_LIBRARY
 EOF
 
 case "$(uname)" in