Skip to content

Commit 45fdb25

Browse files
pepeiborrapepeiborra
authored
Enable dynamic linking in stack builds (#2031)
* Enable dynamic linking to try and avoid oom * bump cache keys
1 parent 78381b8 commit 45fdb25

File tree

11 files changed

+25
-5
lines changed

11 files changed

+25
-5
lines changed

‎.circleci/config.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ defaults: &defaults
1818

1919
- restore_cache:
2020
keys:
21-
- stack-cache-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}-{{ checksum "all-cabal.txt" }}
22-
- stack-cache-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}
23-
- stack-cache-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "resolver.txt" }}
21+
- v2-stack-cache-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}-{{ checksum "all-cabal.txt" }}
22+
- v2-stack-cache-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}
23+
- v2-stack-cache-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "resolver.txt" }}
2424

2525
- run:
2626
name: Stack upgrade
@@ -46,7 +46,7 @@ defaults: &defaults
4646
destination: bin
4747

4848
- save_cache:
49-
key: stack-cache-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "resolver.txt" }}
49+
key: v2-stack-cache-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "resolver.txt" }}
5050
paths: &cache_paths
5151
- ~/.stack
5252
- ~/build/.stack-work
@@ -58,7 +58,7 @@ defaults: &defaults
5858
no_output_timeout: 120m
5959

6060
- save_cache:
61-
key: stack-cache-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}-{{ checksum "all-cabal.txt" }}
61+
key: v2-stack-cache-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}-{{ checksum "all-cabal.txt" }}
6262
paths: *cache_paths
6363

6464
version: 2

‎stack-8.10.2.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ extra-deps:
6969
- unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
7070

7171
configure-options:
72+
$targets:
73+
- --enable-executable-dynamic
7274
ghcide:
7375
- --disable-library-for-ghci
7476
haskell-language-server:

‎stack-8.10.3.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ extra-deps:
6969
- unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
7070

7171
configure-options:
72+
$targets:
73+
- --enable-executable-dynamic
7274
ghcide:
7375
- --disable-library-for-ghci
7476
haskell-language-server:

‎stack-8.10.4.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ extra-deps:
7171
# - hlint-3.3@sha256:4218ad6e03050f5d68aeba0e025f5f05e366c8fd49657f2a19df04ee31b2bb23,4154
7272

7373
configure-options:
74+
$targets:
75+
- --enable-executable-dynamic
7476
ghcide:
7577
- --disable-library-for-ghci
7678
haskell-language-server:

‎stack-8.10.5.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ extra-deps:
7373
# - hlint-3.3@sha256:4218ad6e03050f5d68aeba0e025f5f05e366c8fd49657f2a19df04ee31b2bb23,4154
7474

7575
configure-options:
76+
$targets:
77+
- --enable-executable-dynamic
7678
ghcide:
7779
- --disable-library-for-ghci
7880
haskell-language-server:

‎stack-8.6.4.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ flags:
118118

119119

120120
configure-options:
121+
$targets:
122+
- --enable-executable-dynamic
121123
ghcide:
122124
- --disable-library-for-ghci
123125
haskell-language-server:

‎stack-8.6.5.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ extra-deps:
107107
- resourcet-1.2.3
108108

109109
configure-options:
110+
$targets:
111+
- --enable-executable-dynamic
110112
ghcide:
111113
- --disable-library-for-ghci
112114
haskell-language-server:

‎stack-8.8.3.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ extra-deps:
8686
- unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
8787

8888
configure-options:
89+
$targets:
90+
- --enable-executable-dynamic
8991
ghcide:
9092
- --disable-library-for-ghci
9193
haskell-language-server:

‎stack-8.8.4.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ extra-deps:
8383
- unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
8484

8585
configure-options:
86+
$targets:
87+
- --enable-executable-dynamic
8688
ghcide:
8789
- --disable-library-for-ghci
8890
haskell-language-server:

‎stack-9.0.1.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ extra-deps:
101101
commit: 16e19aaf34e286f3d27b3988c61040823ec66537
102102

103103
configure-options:
104+
$targets:
105+
- --enable-executable-dynamic
104106
ghcide:
105107
- --disable-library-for-ghci
106108
haskell-language-server:

0 commit comments

Comments
 (0)