diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-04 21:08:15 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-04 21:08:15 +0300 |
| commit | 23dda8d4edb3c0efeb34586969ce0c64e385f936 (patch) | |
| tree | 7573726226f43c71edff707dda377ca3088d3477 /.gitlab/ci/caching.gitlab-ci.yml | |
| parent | bf6d126a58a66a11b2e4b9de89986174a1885105 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/ci/caching.gitlab-ci.yml')
| -rw-r--r-- | .gitlab/ci/caching.gitlab-ci.yml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/.gitlab/ci/caching.gitlab-ci.yml b/.gitlab/ci/caching.gitlab-ci.yml index c7b8d49e9d1..92f70fea80d 100644 --- a/.gitlab/ci/caching.gitlab-ci.yml +++ b/.gitlab/ci/caching.gitlab-ci.yml @@ -23,20 +23,17 @@ cache-workhorse: .cache-assets-base: extends: - .compile-assets-base + - .ruby-node-cache - .caching:rules:cache-assets stage: prepare variables: WEBPACK_REPORT: "false" script: - !reference [.yarn-install, script] - - export GITLAB_ASSETS_HASH=$(bundle exec rake gitlab:assets:hash_sum | tee assets-hash.txt) + - export GITLAB_ASSETS_HASH=$(bundle exec rake gitlab:assets:hash_sum | tee cached-assets-hash.txt) - source scripts/gitlab_component_helpers.sh - 'gitlab_assets_archive_doesnt_exist || { echoinfo "INFO: Exiting early as package exists."; exit 0; }' - # If we still use the legacy cache, we don't want to create a package from it as we don't check the sha sum in gitlab:assets:compile_with_new_strategy. - # This line can be removed once we stop downloading the legacy cache. - - rm -rf public/assets - - run_timed_command "bin/rake gitlab:assets:compile_with_new_strategy" - - run_timed_command "scripts/clean-old-cached-assets" + - run_timed_command "bin/rake gitlab:assets:compile" - run_timed_command "create_gitlab_assets_package" - run_timed_command "upload_gitlab_assets_package" |