[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-397-ge23e21d2a
Brought to you by:
sszy
|
From: sszy <ss...@us...> - 2024-02-27 11:01:45
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via e23e21d2a8157993bd66fdd21c7cf75ca0a4340c (commit)
from 29d98ceb696c05511150b5b754a3d0773f125c63 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e23e21d2a8157993bd66fdd21c7cf75ca0a4340c
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Feb 27 12:00:45 2024 +0100
.gitlab-ci.yml: move build to build-merge-request
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci.yml | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b4070249..16401e9ba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,16 +34,18 @@ stages:
- ARMADEUS_PLATFORM: [apf27, apf28, apf51, apf6, opos6ul, opos6ulnano, opos8mm-legacy-5.10]
timeout: 4h
-build:
+build-merge-request:
rules:
- - if: $CI_PIPELINE_SOURCE != "schedule"
+ - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+ when: manual
extends: .build_template
artifacts:
- name: "$ARMADEUS_PLATFORM-$CI_COMMIT_SHORT_SHA-build.log"
- when: on_failure
+ name: "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME-$ARMADEUS_PLATFORM-$CI_COMMIT_SHORT_SHA-images"
paths:
+ - output-images
- build.log
- expire_in: 1 week
+ when: always
+ expire_in: 3 days
build-nightly:
rules:
hooks/post-receive
--
armadeus
|