diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-06-05 16:51:20 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-06-05 16:51:20 +0000 |
| commit | f7ec4df5f07335730018e67ce4ef23560d7225b6 (patch) | |
| tree | 2d67a4dc647481a9daf08f96fe626bdcb34ab3ab | |
| parent | 316fcc99b6524e68dc0f98b5c4fff235bce75bc5 (diff) | |
| parent | 4e5f50d734fece64e29d2c89805a38d3071693ef (diff) | |
| download | gitlab-ce-f7ec4df5f07335730018e67ce4ef23560d7225b6.tar.gz | |
Merge branch '10403-harden-against-gitlab-assets-compile-transient-failures' into 'master'
Harden gitlab:assets:compile against transient network failures
Closes gitlab-ee#10403
See merge request gitlab-org/gitlab-ce!29211
| -rw-r--r-- | .gitlab/ci/frontend.gitlab-ci.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index 8656ffdbb7f..fd5733593ef 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -33,9 +33,9 @@ gitlab:assets:compile: DOCKER_HOST: tcp://docker:2375 script: - node --version - - yarn install --frozen-lockfile --production --cache-folder .yarn-cache + - retry yarn install --frozen-lockfile --production --cache-folder .yarn-cache - free -m - - bundle exec rake gitlab:assets:compile + - retry bundle exec rake gitlab:assets:compile - time scripts/build_assets_image - scripts/clean-old-cached-assets - rm -f /etc/apt/sources.list.d/google*.list # We don't need to update Chrome here @@ -65,9 +65,9 @@ compile-assets: stage: prepare script: - node --version - - yarn install --frozen-lockfile --cache-folder .yarn-cache + - retry yarn install --frozen-lockfile --cache-folder .yarn-cache - free -m - - bundle exec rake gitlab:assets:compile + - retry bundle exec rake gitlab:assets:compile - scripts/clean-old-cached-assets variables: # we override the max_old_space_size to prevent OOM errors |