[Git][ghc/ghc][ghc-8.6] 3 commits: Do not build i386 Windows with profiled libraries

[Ben Gamari]

Ben Gamari pushed to branch ghc-8.6 at Glasgow Haskell Compiler / GHC


Commits:
f0592c22 by Ben Gamari at 2019-04-19T13:45:03Z
Do not build i386 Windows with profiled libraries

Due to #15934

- - - - -
71abf35a by Ben Gamari at 2019-04-19T13:47:48Z
gitlab-ci: Add centos7 release job

- - - - -
1df8c217 by Takenobu Tani at 2019-04-19T14:22:27Z
gitlab-ci: Enable -haddock while building ghc library

Fixing #16415. This is a variant of @takenobu-hs's !769.

- - - - -


2 changed files:

- .circleci/prepare-system.sh
- .gitlab-ci.yml


Changes:

=====================================
.circleci/prepare-system.sh
=====================================
@@ -30,6 +30,7 @@ BuildFlavour=$BUILD_FLAVOUR
 ifneq "\$(BuildFlavour)" ""
 include mk/flavours/\$(BuildFlavour).mk
 endif
+GhcLibHcOpts+=-haddock
 EOF
 
 case "$(uname)" in


=====================================
.gitlab-ci.yml
=====================================
@@ -1,7 +1,7 @@
 variables:
   GIT_SSL_NO_VERIFY: "1"
   # Commit of ghc/ci-images repository from which to pull Docker images
-  DOCKER_REV: 6d19c3adc1f5c28c82aed8c5b1ac40931ac60f3f
+  DOCKER_REV: cefaee3c742af193e0f7783f87edb0d35374515c
 
 before_script:
   - python3 .gitlab/fix-submodules.py
@@ -130,6 +130,7 @@ validate-x86_64-darwin:
     - PATH="`pwd`/toolchain/bin:$PATH"
       # Disable sphinx PDF output as MacTeX apparently doesn't provide xelatex
     - echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
+    - echo "GhcLibHcOpts += -haddock" >> mk/build.mk
     - echo "libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-intree-gmp" >> mk/build.mk
   after_script:
     - cp -Rf $HOME/.cabal cabal-cache
@@ -153,13 +154,14 @@ validate-x86_64-darwin:
     - git submodule update --init --recursive
     - git checkout .gitmodules
     - "git fetch https://gitlab.haskell.org/ghc/ghc-performance-notes.git refs/notes/perf:refs/notes/perf || true"
+    - bash .circleci/prepare-system.sh
       # Build hyperlinked sources for documentation when building releases
     - |
       if [[ -n "$CI_COMMIT_TAG" ]]; then
+        echo "GhcLibHcOpts += -haddock" >> mk/build.mk
         echo "EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump" >> mk/build.mk
       fi
 
-    - bash .circleci/prepare-system.sh
     # workaround for docker permissions
     - sudo chown ghc:ghc -R .
   after_script:
@@ -317,7 +319,49 @@ validate-x86_64-linux-deb9-unreg:
     CONFIGURE_ARGS: --enable-unregisterised
   image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV"
   cache:
-    key: linux-x86_64-deb9
+    key: linux-x86_64-deb8
+  artifacts:
+    when: always
+    expire_in: 2 week
+
+#################################
+# x86_64-linux-centos7
+#################################
+
+release-x86_64-linux-centos7:
+  extends: .validate-linux
+  stage: full-build
+  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-centos7:$DOCKER_REV"
+  variables:
+    # The sphinx release shipped with Centos 7 fails to build out documentation
+    BUILD_SPHINX_HTML: "NO"
+    BUILD_SPHINX_PDF: "NO"
+    TEST_ENV: "x86_64-linux-centos7"
+    BIN_DIST_PREP_TAR_COMP: "bindistprep/ghc-x86_64-centos7-linux.tar.xz"
+  only:
+    - tags
+  cache:
+    key: linux-x86_64-centos7
+  artifacts:
+    when: always
+    expire_in: 2 week
+
+#################################
+# x86_64-linux-fedora27
+#################################
+
+validate-x86_64-linux-fedora27:
+  extends: .validate-linux
+  stage: full-build
+  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora27:$DOCKER_REV"
+  variables:
+    TEST_ENV: "x86_64-linux-fedora27"
+    BIN_DIST_PREP_TAR_COMP: "bindistprep/ghc-x86_64-fedora27-linux.tar.xz"
+  cache:
+    key: linux-x86_64-fedora27
+  artifacts:
+    when: always
+    expire_in: 2 week
 
 ############################################################
 # Validation via Pipelines (Windows)
@@ -341,6 +385,7 @@ validate-x86_64-linux-deb9-unreg:
     - git submodule update --init --recursive
     - git checkout .gitmodules
     - bash .gitlab/win32-init.sh
+    - bash -c 'echo "GhcLibHcOpts += -haddock" >> mk/build.mk'
   after_script:
     - rd /s /q tmp
     - robocopy /np /nfl /ndl /e "%APPDATA%\cabal" cabal-cache
@@ -414,6 +459,8 @@ validate-i386-windows:
     GHC_VERSION: "8.6.2"
     LANG: "en_US.UTF-8"
     MSYSTEM: MINGW32
+    # Due to #15934
+    BUILD_PROF_LIBS: "NO"
   script:
     - |
       python boot



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/4c7d32280b6fbea95af12432deaf0c9c57be6ad7...1df8c2175cb6214dc0c09c37113140b2f0b38bce

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/4c7d32280b6fbea95af12432deaf0c9c57be6ad7...1df8c2175cb6214dc0c09c37113140b2f0b38bce
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20190419/aac14cf0/attachment-0001.html>