diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-07-02 15:53:12 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-07-02 15:53:12 +0000 |
| commit | 5de53c55654dc2e37d4fe51321f2ae55cb24dff7 (patch) | |
| tree | 462f2a3f256a93cf0bb93a2365ef423b7b935d07 | |
| parent | 833c4b81a582c5ea067e1302ac80b4417c647d8c (diff) | |
| parent | d5842e7490a6826bbaaaa7c76c967a48e96dd1ef (diff) | |
| download | gitlab-ce-5de53c55654dc2e37d4fe51321f2ae55cb24dff7.tar.gz | |
Merge branch 'leipert-prefer-offline-yarn' into 'master'
Prefer offline install for yarn
See merge request gitlab-org/gitlab-ce!30267
| -rw-r--r-- | .gitlab/ci/frontend.gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | .gitlab/ci/review.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | lib/tasks/yarn.rake | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index 6e80cb530f1..0c0985decdd 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -32,7 +32,7 @@ DOCKER_HOST: tcp://docker:2375 script: - node --version - - retry yarn install --frozen-lockfile --production --cache-folder .yarn-cache + - retry yarn install --frozen-lockfile --production --cache-folder .yarn-cache --prefer-offline - free -m - retry bundle exec rake gitlab:assets:compile - time scripts/build_assets_image @@ -82,7 +82,7 @@ gitlab:assets:compile pull-cache: stage: prepare script: - node --version - - retry yarn install --frozen-lockfile --cache-folder .yarn-cache + - retry yarn install --frozen-lockfile --cache-folder .yarn-cache --prefer-offline - free -m - retry bundle exec rake gitlab:assets:compile - scripts/clean-old-cached-assets @@ -231,7 +231,7 @@ qa:selectors: before_script: [] script: - date - - yarn install --frozen-lockfile --cache-folder .yarn-cache + - yarn install --frozen-lockfile --cache-folder .yarn-cache --prefer-offline - date - yarn run webpack-prod diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index 933af90c85a..61fd48fd72e 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.gitlab/ci/review.gitlab-ci.yml @@ -236,5 +236,5 @@ danger-review: script: - git version - node --version - - yarn install --frozen-lockfile --cache-folder .yarn-cache + - yarn install --frozen-lockfile --cache-folder .yarn-cache --prefer-offline - danger --fail-on-errors=true diff --git a/lib/tasks/yarn.rake b/lib/tasks/yarn.rake index 2ac88a039e7..32061ad4a57 100644 --- a/lib/tasks/yarn.rake +++ b/lib/tasks/yarn.rake @@ -24,7 +24,7 @@ namespace :yarn do desc 'Install Node dependencies with Yarn' task install: ['yarn:available'] do - unless system('yarn install --pure-lockfile --ignore-engines') + unless system('yarn install --pure-lockfile --ignore-engines --prefer-offline') abort 'Error: Unable to install node modules.'.color(:red) end end |