diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-04-15 16:33:29 +0200 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-04-15 16:33:29 +0200 |
| commit | bad7933d88e99bbb52780d4f48effcd190bf452d (patch) | |
| tree | 0a9018547454ddddecc790e65eef756c6e3a7b04 | |
| parent | 0facd44acee6a516cd3e2dc272cbc0c6b2b0ecd0 (diff) | |
| download | gitlab-ce-eat-my-data.tar.gz | |
WIPeat-my-data
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | scripts/prepare_build.sh | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0467cd25cef..9259b040a81 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -176,8 +176,6 @@ stages: - '[[ -f $FLAKY_RSPEC_REPORT_PATH ]] || echo "{}" > ${FLAKY_RSPEC_REPORT_PATH}' - '[[ -f $NEW_FLAKY_RSPEC_REPORT_PATH ]] || echo "{}" > ${NEW_FLAKY_RSPEC_REPORT_PATH}' - scripts/gitaly-test-spawn - - ls -al /usr/bin | grep eatmydata - - echo "$PATH" - eatmydata knapsack rspec "--color --format documentation --format RspecJunitFormatter --out junit_rspec.xml" artifacts: expire_in: 31d diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index b32d0c818f2..d5ec3f28144 100644 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -5,8 +5,11 @@ export USE_BUNDLE_INSTALL=${USE_BUNDLE_INSTALL:-true} export BUNDLE_INSTALL_FLAGS="--without=production --jobs=$(nproc) --path=vendor --retry=3 --quiet" # install eatmydata -wget http://ftp.us.debian.org/debian/pool/main/libe/libeatmydata/libeatmydata1_105-5_amd64.deb +wget http://ftp.us.debian.org/debian/pool/main/libe/libeatmydata/libeatmydata1_105-5_amd64.deb \ + http://ftp.us.debian.org/debian/pool/main/libe/libeatmydata/eatmydata_105-5_all.deb + dpkg -i libeatmydata1_105-5_amd64.deb +dpkg -i eatmydata_105-5_all.deb if [ "$USE_BUNDLE_INSTALL" != "false" ]; then bundle install --clean $BUNDLE_INSTALL_FLAGS && bundle check |