diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2019-05-30 07:37:40 +0000 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2019-05-30 07:37:40 +0000 |
commit | 1ba1df9c2a38f5e028a84c63ff552af723696491 (patch) | |
tree | d15951fded2328a9994c82b134bdb922969d800f | |
parent | b819d38db6510ad1cf9d6c02b16b44c2a661907b (diff) | |
parent | 590b79e84bcd796728d8848c94c1241f3351546f (diff) | |
download | gitlab-ce-1ba1df9c2a38f5e028a84c63ff552af723696491.tar.gz |
Merge branch 'sh-remove-chrome-apt-dependency-ci' into 'master'
Remove Google apt source from gitlab:assets:compile step
See merge request gitlab-org/gitlab-ce!28905
-rw-r--r-- | .gitlab/ci/frontend.gitlab-ci.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index 986ba7558d5..d62b24ae97d 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -38,6 +38,7 @@ gitlab:assets:compile: - 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 # Play dependent manual jobs - install_api_client_dependencies_with_apt - play_job "review-build-cng" || true # this job might not exist so ignore the failure if it cannot be played |