Skip to content

Commit 1799492

Browse files
committed
[DDW-1110] Turn off Boehm GC in Nix
1 parent faaf57e commit 1799492

File tree

3 files changed

+32
-21
lines changed

3 files changed

+32
-21
lines changed

.buildkite/pipeline.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,26 @@ env:
22
ARTIFACT_BUCKET: s3://ci-output-sink
33
steps:
44
- label: 'daedalus-x86_64-darwin'
5-
command: 'scripts/build-installer-unix.sh--nix-2.5 --build-id $BUILDKITE_BUILD_NUMBER'
5+
command: 'scripts/with-nix-2.5.sh scripts/build-installer-unix.sh --build-id $BUILDKITE_BUILD_NUMBER'
66
env:
77
NIX_SSL_CERT_FILE: /nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt
88
agents:
99
queue: daedalus
1010
system: x86_64-darwin
1111
- label: 'daedalus-aarch64-darwin'
12-
command: 'scripts/build-installer-unix.sh--nix-2.5 --build-id $BUILDKITE_BUILD_NUMBER'
12+
command: 'scripts/with-nix-2.5.sh scripts/build-installer-unix.sh --build-id $BUILDKITE_BUILD_NUMBER'
1313
env:
1414
NIX_SSL_CERT_FILE: /nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt
1515
UPLOAD_DIR_OVERRIDE: UNSAFE-internal-build
1616
agents:
1717
queue: daedalus
1818
system: aarch64-darwin
1919
- label: 'daedalus-x86_64-linux-nix'
20-
command: 'scripts/build-installer-nix.sh $BUILDKITE_BUILD_NUMBER'
20+
command: 'scripts/with-nix-2.5.sh scripts/build-installer-nix.sh $BUILDKITE_BUILD_NUMBER'
2121
agents:
2222
system: x86_64-linux
2323
- label: 'daedalus-x86_64-windows-nix'
24-
command: 'scripts/build-cross-windows.sh $BUILDKITE_BUILD_NUMBER'
24+
command: 'scripts/with-nix-2.5.sh scripts/build-cross-windows.sh $BUILDKITE_BUILD_NUMBER'
2525
agents:
2626
system: x86_64-linux
2727

scripts/build-installer-unix.sh--nix-2.5

Lines changed: 0 additions & 17 deletions
This file was deleted.

scripts/with-nix-2.5.sh

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#!/usr/bin/env bash
2+
set -e
3+
4+
if [ $# -eq 0 ] ; then
5+
echo >&2 "fatal: usage: $0 <command> [<args>...]"
6+
exit 1
7+
fi
8+
9+
echo "~~~ Obtaining ‘pkgs.nixUnstable’"
10+
11+
myDir=$(dirname "$0")
12+
nixUnstable=$(nix-build "$myDir"/../default.nix -A pkgs.nixUnstable)
13+
14+
PATH="$nixUnstable/bin:$PATH"
15+
16+
# *Maybe* prevent segfaults on `aarch64-darwin` in `GC_*` code:
17+
export GC_DONT_GC=1 # <https://chromium.googlesource.com/chromiumos/third_party/gcc/+/f4131b9cddd80547d860a6424ee1644167a330d6/gcc/gcc-4.6.0/boehm-gc/doc/README.environment#151>
18+
19+
export NIX_CONFIG='
20+
experimental-features = nix-command flakes
21+
'
22+
23+
nix --version
24+
echo
25+
26+
echo "~~~ Running ‘$1"
27+
28+
exec "$@"

0 commit comments

Comments
 (0)