diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-09 18:11:41 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-09 18:11:41 +0300 |
commit | d56569ff3e73ae1dbcf93d2530925c4ecb8fd185 (patch) | |
tree | f89e6dd59d8d807201a9dd3ca46b5eee0ea5f438 /.gitlab | |
parent | 1faea1c6a0464e44dca4477fb31846938c2ad871 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
-rw-r--r-- | .gitlab/ci/frontend.gitlab-ci.yml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index 09d6274e045..f103032ee69 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -31,6 +31,10 @@ - assets_compile_script - echo -n "${GITLAB_ASSETS_HASH}" > "cached-assets-hash.txt" +.update-cache-base: + after_script: + - yarn patch-package --reverse # To avoid caching patched modules + compile-production-assets: extends: - .compile-assets-base @@ -47,8 +51,6 @@ compile-production-assets: - public/assets/ - "${WEBPACK_COMPILE_LOG_PATH}" when: always - after_script: - - rm -f /etc/apt/sources.list.d/google*.list # We don't need to update Chrome here compile-production-assets as-if-foss: extends: @@ -77,6 +79,7 @@ compile-test-assets as-if-foss: update-assets-compile-production-cache: extends: - compile-production-assets + - .update-cache-base - .assets-compile-cache-push - .shared:rules:update-cache stage: prepare @@ -85,6 +88,7 @@ update-assets-compile-production-cache: update-assets-compile-test-cache: extends: - compile-test-assets + - .update-cache-base - .assets-compile-cache-push - .shared:rules:update-cache stage: prepare @@ -94,6 +98,7 @@ update-storybook-yarn-cache: extends: - .default-retry - .default-utils-before_script + - .update-cache-base - .storybook-yarn-cache-push - .shared:rules:update-cache stage: prepare |