Skip to content
This repository has been archived by the owner on Sep 13, 2019. It is now read-only.

Update a version of LTS to 13.26 #54

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
- run: wget -qO- https://get.haskellstack.org/ | sh
- run: gcc --version
- run: stack --version
- run: mkdir -p ~/.stack && cp .circleci/stack-config.yaml ~/.stack/config.yaml
- run: cd deps/ ; ./get-deps.sh USE_BINARY_FOR_CI
- run:
name: stack build
Expand All @@ -35,7 +36,7 @@ jobs:
- run: apt update -qq && apt install -y cmake curl wget unzip git libtinfo-dev python3 python3-yaml
- run: apt -y --allow-downgrades --allow-remove-essential --allow-change-held-packages install locales software-properties-common apt-transport-https
- run: add-apt-repository ppa:hvr/ghc
- run: apt-get update -qq && apt-get -y --allow-downgrades --allow-remove-essential --allow-change-held-packages install build-essential zlib1g-dev liblapack-dev libblas-dev ghc-8.6.4 cabal-install-head devscripts debhelper python3-pip
- run: apt-get update -qq && apt-get -y --allow-downgrades --allow-remove-essential --allow-change-held-packages install build-essential zlib1g-dev liblapack-dev libblas-dev ghc-8.6.5 cabal-install-head devscripts debhelper python3-pip
- run: update-alternatives --install /usr/bin/python python /usr/bin/python3 1
- checkout
- run: git submodule init && git submodule update
Expand All @@ -49,10 +50,9 @@ jobs:
name: cabal new-build all
command: cabal new-build all --jobs=2
no_output_timeout: 15m
- run: cabal new-test ffi --jobs=2
- run: cabal new-test all --jobs=2
- run: cabal new-exec codegen-exe
- run: cabal new-test ffi --jobs=2
- run: cabal new-test hasktorch
- run: cabal new-test all --jobs=2
- run: cabal exec xor_mlp
osx-stack-build:
macos:
Expand All @@ -74,6 +74,7 @@ jobs:
- run: wget -qO- https://get.haskellstack.org/ | sh
- run: clang --version
- run: stack --version
- run: mkdir -p ~/.stack && cp .circleci/stack-config.yaml ~/.stack/config.yaml
- run: cd deps/ ; ./get-deps.sh USE_BINARY_FOR_CI
- run: cp -a deps/libtorch/lib/*.dylib deps/mklml/lib/*.dylib /usr/local/lib/
- run:
Expand Down
17 changes: 17 additions & 0 deletions .circleci/stack-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package-indices:
- download-prefix: https://hackage.haskell.org/
hackage-security:
keyids:
- 0a5c7ea47cd1b15f01f5f51a33adda7e655bc0f0b0615baa8e271f4c3351e21d
- 1ea9ba32c526d1cc91ab5e5bd364ec5e9e8cb67179a471872f6e26f0ae773d42
- 280b10153a522681163658cb49f632cde3f38d768b736ddbc901d99a1a772833
- 2a96b1889dc221c17296fcc2bb34b908ca9734376f0f361660200935916ef201
- 2c6c3627bd6c982990239487f1abd02e08a02e6cf16edb105a8012d444d870c3
- 51f0161b906011b52c6613376b1ae937670da69322113a246a09f807c62f6921
- 772e9f4c7db33d251d5c6e357199c819e569d130857dc225549b40845ff0890d
- aa315286e6ad281ad61182235533c41e806e5a787e0b6d1e7eef3f09d137d2e9
- fe331502606802feac15e514d9b9ea83fee8b6ffef71335479a2e68d84adc6b0
key-threshold: 3 # number of keys required

# ignore expiration date, see https://github.com/commercialhaskell/stack/pull/4614
ignore-expiry: no
2 changes: 1 addition & 1 deletion setup-cabal.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -xe

curl https://www.stackage.org/lts-13.23/cabal.config | grep -v inline-c > cabal.project.freeze
curl https://www.stackage.org/lts-13.26/cabal.config | grep -v inline-c > cabal.project.freeze

cat <<EOF > cabal.project.local

Expand Down
5 changes: 2 additions & 3 deletions stack.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-13.1
resolver: lts-13.26

packages:
- codegen
Expand All @@ -19,5 +19,4 @@ extra-lib-dirs:
# see https://github.com/commercialhaskell/stack/issues/4073
# with-gcc: /usr/local/bin/gcc-7

extra-deps:
- template-0.2.0.10@sha256:f822de4d34c45bc84b33a61bc112c15fedee6fa6dc414c62b10456395a868f85
extra-deps: []