diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2018-11-05 13:45:59 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-11-07 08:09:39 -0500 |
| commit | 406978c478e4b14e677f396499420d7b8e5d21fd (patch) | |
| tree | c8bea9abfb7fa1c110131e4e941c2248c9c2e824 /.circleci | |
| parent | 648b0c2dc8ef8c6ce2325389b84d629f7bdf6ff0 (diff) | |
| download | haskell-406978c478e4b14e677f396499420d7b8e5d21fd.tar.gz | |
CircleCI: Build DWARF-enabled Linux bindists
Diffstat (limited to '.circleci')
| -rw-r--r-- | .circleci/config.yml | 23 | ||||
| -rwxr-xr-x | .circleci/prepare-system.sh | 7 |
2 files changed, 30 insertions, 0 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index f35690124b..6fd9b84075 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -114,6 +114,27 @@ jobs: - *test - *store_test_results + "validate-x86_64-linux-dwarf": + resource_class: xlarge + docker: + - image: ghcci/x86_64-linux:0.0.4 + environment: + <<: *buildenv + GHC_COLLECTOR_FLAVOR: x86_64-linux-dwarf + ENABLE_DWARF: 1 + CONFIGURE_OPTS: --enable-dwarf-unwind + steps: + - checkout + - *prepare + - *submodules + - *boot + - *configure_unix + - *make + - *bindist + - *storeartifacts + - *test + - *store_test_results + "validate-x86_64-freebsd": resource_class: xlarge docker: @@ -292,6 +313,8 @@ workflows: jobs: - validate-x86_64-linux: *trigger_on_tags + - validate-x86_64-linux-dwarf: + *trigger_on_tags # FreeBSD disabled: https://github.com/haskell/unix/issues/102 # - validate-x86_64-freebsd - validate-x86_64-darwin: diff --git a/.circleci/prepare-system.sh b/.circleci/prepare-system.sh index dbb1011df5..39d32f13bc 100755 --- a/.circleci/prepare-system.sh +++ b/.circleci/prepare-system.sh @@ -22,6 +22,10 @@ BUILD_SPHINX_PDF=$BUILD_SPHINX_PDF BeConservative=YES EOF +if [[ -z ${ENABLE_DWARF:-} ]]; then + echo "GhcLibHcOpts=-g3" >> mk/build.mk +fi + case "$(uname)" in Linux) if [[ -n ${TARGET:-} ]]; then @@ -47,6 +51,9 @@ case "$(uname)" in cabal update cabal install --reinstall hscolour sudo ln -s /home/ghc/.cabal/bin/HsColour /usr/local/bin/HsColour || true + if [[ -z ${ENABLE_DWARF:-} ]]; then + apt-get install -qy libdw1-dev + fi fi ;; |