diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-29 15:10:00 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-29 15:10:00 +0300 |
commit | 4233d3aa86fe94e6288279aa55d42ed95bfe753c (patch) | |
tree | 7b97b519371f6df1fa6a0f2ffe69535207a73754 /.gitlab | |
parent | e357d4951c53a3ce4f696cf533ce24a4c6350a7e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
-rw-r--r-- | .gitlab/ci/frontend.gitlab-ci.yml | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index 293beb60cfd..3e2ccb6fdfe 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -67,15 +67,12 @@ build-assets-image: stage: build-images needs: ["gitlab:assets:compile pull-cache"] variables: - GIT_STRATEGY: none + GIT_DEPTH: "1" script: - - wget -O ./build_assets_image "${CI_PROJECT_URL}/raw/${CI_COMMIT_SHA}/scripts/build_assets_image" - - wget -O ./Dockerfile.assets "${CI_PROJECT_URL}/raw/${CI_COMMIT_SHA}/Dockerfile.assets" - - chmod +x build_assets_image # TODO: Change the image tag to be the MD5 of assets files and skip image building if the image exists # We'll also need to pass GITLAB_ASSETS_TAG to the trigerred omnibus-gitlab pipeline similarly to how we do it for trigerred CNG pipelines # https://gitlab.com/gitlab-org/gitlab/issues/208389 - - ./build_assets_image + - scripts/build_assets_image .compile-assets-metadata: extends: |