X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=.gitlab-ci.yml;h=97f96ffc833883e4890fe55ef8602acb68ae3086;hb=57d54a9f095774d856b7966c5fbc08c27fbdd586;hp=4e1148772d5758eabec18e28e6328cb31eb5f11c;hpb=8dff4c71940857e2d6f7368516b81cf168f71c91;p=akkoma

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4e1148772..97f96ffc8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -143,8 +143,6 @@ stop_review_app:
     - ssh -t dokku@pleroma.online -- --force apps:destroy "$CI_ENVIRONMENT_SLUG"
     - ssh -t dokku@pleroma.online -- --force postgres:destroy $(echo $CI_ENVIRONMENT_SLUG | sed -e 's/-/_/g')_db
 
-# TODO: Restrict to master and develop
-
 amd64:
   stage: release 
   # TODO: Replace with upstream image when 1.9.0 comes out
@@ -152,11 +150,16 @@ amd64:
   only: &release-only
   - master@pleroma/pleroma
   - develop@pleroma/pleroma
-  - feature/ci-release-build@pleroma/pleroma
   artifacts: &release-artifacts
     name: "pleroma-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA-$CI_JOB_NAME"
     paths:
       - release/*
+    # Ideally it would be never for master branch and with the next commit for develop,
+    # but Gitlab does not support neither `only` for artifacts
+    # nor setting it to never from .gitlab-ci.yml
+    # nor expiring with the next commit
+    expire_in: 42 yrs
+
   cache: &release-cache
     key: $CI_COMMIT_REF_NAME-$CI_JOB_NAME
     paths: