diff options
author | feld <feld@feld.me> | 2024-01-21 04:36:24 +0000 |
---|---|---|
committer | feld <feld@feld.me> | 2024-01-21 04:36:24 +0000 |
commit | 548434f85ccaa4a77c460fb5bda37153ea6e9c39 (patch) | |
tree | 2098793b905a79e7392430ce2548209df9349d9e | |
parent | 12b689a81eaf41848b0fa8200a38834868eeaf43 (diff) | |
parent | 951a82f2d72dcb0c4e1024f1e006dd1a17d1ab82 (diff) | |
download | pleroma-548434f85ccaa4a77c460fb5bda37153ea6e9c39.tar.gz pleroma-548434f85ccaa4a77c460fb5bda37153ea6e9c39.zip |
Merge branch 'new-pipelines' into 'develop'
Fix testing cache policy, really.
See merge request pleroma/pleroma!4038
-rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d5cbc037d..8f1839c42 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,6 +127,8 @@ unit-testing-1.12.3: - .using-ci-base stage: test cache: &testing_cache_policy + <<: *global_cache_policy + policy: pull services: &testing_services - name: postgres:13-alpine alias: postgres @@ -150,8 +152,6 @@ unit-testing-1.15.7-otp-25: image: git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.15-otp25 allow_failure: true cache: *testing_cache_policy - <<: *global_cache_policy - policy: pull services: *testing_services script: *testing_script |