From a4e7803f76bccc1a4db133bb8d311cb826deded9 Mon Sep 17 00:00:00 2001 From: Eidolon Date: Sun, 15 Sep 2024 18:32:57 -0500 Subject: [PATCH] Apply artifact expiration directly to jobs Works around the issue with Gitlab CI not supporting the expire_in property on the default job properties, as Steelt found. https://gitlab.com/gitlab-org/gitlab/-/issues/404563 --- .gitlab-ci.yml | 2 -- .gitlab/ci/jobs/alpine-3-gcc.yml | 1 + .gitlab/ci/templates/srb2ci.yml | 3 +++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 29f5ef5ff..b723b82e0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,5 +15,3 @@ stages: default: interruptible: true - artifacts: - expire_in: 1 day diff --git a/.gitlab/ci/jobs/alpine-3-gcc.yml b/.gitlab/ci/jobs/alpine-3-gcc.yml index 4400cba8f..88c413d9d 100644 --- a/.gitlab/ci/jobs/alpine-3-gcc.yml +++ b/.gitlab/ci/jobs/alpine-3-gcc.yml @@ -19,6 +19,7 @@ Alpine 3 GCC: - "build.alpine3/src/config.h" expose_as: "Apline-3" name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Apline-3" + expire_in: 1 day before_script: - - | diff --git a/.gitlab/ci/templates/srb2ci.yml b/.gitlab/ci/templates/srb2ci.yml index 3716d9df9..0a606f8e4 100644 --- a/.gitlab/ci/templates/srb2ci.yml +++ b/.gitlab/ci/templates/srb2ci.yml @@ -15,6 +15,9 @@ - build/apt-cache unprotect: true + artifacts: + expire_in: 1 day + before_script: - - | # debconf