diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1276aa20..105513d1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -88,7 +88,7 @@ jekyll: BUNDLE_WITHOUT: test:coverage:assorted script: - apk --update add g++ make git - - bundle install + - bundle install --quiet - bundle exec rake prepare_website - bundle exec jekyll build -s www -d www/public artifacts: @@ -108,7 +108,7 @@ coverage: image: "ruby:2.7-alpine" script: - apk --update add g++ make - - bundle install + - bundle install --quiet # this is a workaround, because simplecov doesn't support relative paths. # # https://github.com/simplecov-ruby/simplecov/issues/887 diff --git a/spec.sh b/spec.sh index 507807c8..a9dfc28c 100755 --- a/spec.sh +++ b/spec.sh @@ -16,10 +16,7 @@ else extra="-f docker-compose-gitlab.yml -f docker-compose-${RUBY}-${VERSION}.yml" fi -docker-compose -f docker-compose.yml ${extra} -p ci build -docker-compose -f docker-compose.yml ${extra} -p ci up \ - --exit-code-from httpx \ - --abort-on-container-exit +docker-compose -f docker-compose.yml ${extra} -p ci run httpx # # diff --git a/test/support/ci/build.sh b/test/support/ci/build.sh index 9a7b7508..c84297ba 100755 --- a/test/support/ci/build.sh +++ b/test/support/ci/build.sh @@ -20,7 +20,7 @@ mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" gem install bundler -v="1.17.3" --no-doc --conservative cd /home -bundle install +bundle install --quiet bundle exec rake test:ci RET=$?