diff options
| author | Varac <varac@leap.se> | 2017-02-06 14:43:56 +0000 |
|---|---|---|
| committer | Varac <varac@leap.se> | 2017-02-06 14:43:56 +0000 |
| commit | 36e47f7ae592e753149928a2a754d5e6f5abf74f (patch) | |
| tree | 97447efa5dbc83c8d73af4e57b66a1464d3f28f8 | |
| parent | e7db5f1afce893772e2437cfa6305051b19eb073 (diff) | |
| parent | 98a19ce148800d0945fbddf59f5bafbb09748fd5 (diff) | |
Merge branch 'dont_run_bundle_install_in_parallel' into 'master'
Platform CI: Dont run bundle install in parallel
Closes #8684
See merge request !67
| -rw-r--r-- | .gitlab-ci.yml | 18 | ||||
| -rwxr-xr-x | tests/platform-ci/setup.sh | 2 |
2 files changed, 16 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c6cbb666..ab2d5aa5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,13 +1,25 @@ +image: leapcode/ruby + +# This is for caching the gems not only between the stages, but also persistent +# on the gitlab-runner so we don't need to install from scratch on every pipeline +cache: + key: "$CI_BUILD_REF_NAME" + untracked: true + paths: + - tests/platform-ci/vendor/ + before_script: - - echo 'Running global before_script' - cd tests/platform-ci - - ./setup.sh stages: + - setup - syntax - build -image: leapcode/ruby +setup: + stage: setup + script: + - ./setup.sh lint: stage: syntax diff --git a/tests/platform-ci/setup.sh b/tests/platform-ci/setup.sh index 39ef3130..99f735b7 100755 --- a/tests/platform-ci/setup.sh +++ b/tests/platform-ci/setup.sh @@ -1,4 +1,4 @@ #!/bin/sh which bundle || /usr/bin/apt install bundle -/usr/local/bin/bundle install --binstubs --path=/var/cache/gitlab-runner/ --with=test --jobs "$(nproc)" +/usr/local/bin/bundle install --binstubs --path=vendor --with=test --jobs "$(nproc)" |