diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-16 21:09:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-16 21:09:24 +0300 |
| commit | 1eec6b22b26d09ce6927adf66f98d755a6339815 (patch) | |
| tree | b1bb8bbdc0d49136bfd176a1e64d3bd9f2969396 /.gitlab | |
| parent | b4e854a900ba9bcbfc3476f88317c59ea048daaf (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/verify-lockfile.gitlab-ci.yml | 11 |
2 files changed, 2 insertions, 11 deletions
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index fc6c005a13a..22aa92779ea 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -194,6 +194,8 @@ update-rails-cache: extends: - update-setup-test-env-cache - .rails-cache + cache: + policy: push # We want to rebuild the cache from scratch to ensure stale dependencies are cleaned up. .coverage-base: extends: diff --git a/.gitlab/ci/verify-lockfile.gitlab-ci.yml b/.gitlab/ci/verify-lockfile.gitlab-ci.yml deleted file mode 100644 index 6336a428b4b..00000000000 --- a/.gitlab/ci/verify-lockfile.gitlab-ci.yml +++ /dev/null @@ -1,11 +0,0 @@ -verify_lockfile: - stage: test - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.2-git-2.29-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.34 - needs: [] - rules: - - changes: - - yarn.lock - script: - - npm config set @dappelt:registry https://gitlab.com/api/v4/projects/22564149/packages/npm/ - - npx lockfile-lint@4.3.7 --path yarn.lock --allowed-hosts yarn --validate-https - - npx @dappelt/untamper-my-lockfile --lockfile yarn.lock |