Skip to content
This repository was archived by the owner on Aug 18, 2020. It is now read-only.

Commit 1acfcde

Browse files
authored
Merge pull request #3297 from input-output-hk/devops-972-fix-locale-osx
[DEVOPS-972] fix connectScripts evaluation on OSX
2 parents f4af844 + 3c2f8b3 commit 1acfcde

File tree

3 files changed

+2
-2
lines changed

3 files changed

+2
-2
lines changed

appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ before_test:
7373

7474
# Install rocksdb
7575
- git clone https://github.com/facebook/rocksdb.git --branch v4.13.5
76-
- ps: Start-FileDownload 'https://ci.appveyor.com/api/buildjobs/kbpteb8j55p6sa2m/artifacts/rocksdb%2Fbuild%2FRocksdb.zip' -FileName rocksdb.zip
76+
- ps: Start-FileDownload 'https://s3.eu-central-1.amazonaws.com/ci-static/serokell-rocksdb-haskell-325427fc709183c8fdf777ad5ea09f8d92bf8585.zip' -FileName rocksdb.zip
7777
- 7z x rocksdb.zip
7878

7979
# CSL-1509: After moving the 'cardano-sl' project itself into a separate folder ('lib/'), the 'cardano-text.exe' executable fails on AppVeyor CI.

docker.nix

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ let
1919
#!/bin/sh
2020
set -e
2121
set -o pipefail
22+
export LOCALE_ARCHIVE="${pkgs.glibcLocales}/lib/locale/locale-archive"
2223
if [ ! -d /wallet ]; then
2324
echo '/wallet volume not mounted, you need to create one with `docker volume create` and pass the correct -v flag to `docker run`'
2425
exit 1

scripts/launch/connect-to-cluster/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ in pkgs.writeScript "${executable}-connect-to-${environment}" ''
8181
else
8282
RUNTIME_ARGS=""
8383
fi
84-
export LOCALE_ARCHIVE="${pkgs.glibcLocales}/lib/locale/locale-archive";
8584
8685
echo "Keeping state in ${stateDir}"
8786
mkdir -p ${stateDir}/logs

0 commit comments

Comments
 (0)