File tree Expand file tree Collapse file tree 1 file changed +1
-5
lines changed Expand file tree Collapse file tree 1 file changed +1
-5
lines changed Original file line number Diff line number Diff line change 9
9
# Build and test with ANOD
10
10
# TODO: add a build and test based on Alire in parallel to this.
11
11
build_and_test :
12
- rules :
13
- # Let's do the job only for merge request events: that's
14
- # when we know whether the target branch is 'edge'.
15
- - if : $CI_PIPELINE_SOURCE == 'merge_request_event'
16
12
services :
17
13
- image:sandbox
18
14
- cpu:8
@@ -26,7 +22,7 @@ build_and_test:
26
22
# Check whether we're in an MR targeting 'edge' and setup some
27
23
# variables if so.
28
24
- TARGET_BRANCH="master"
29
- - if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" = "edge " ]; then
25
+ - if [ "x $CI_MERGE_REQUEST_TARGET_BRANCH_NAME" = "xedge " ]; then
30
26
echo "Targeting the edge branch." ;
31
27
REPO_SUFFIX="-edge" ;
32
28
BUILD_SPACE_SUFFIX="_edge" ;
You can’t perform that action at this time.
0 commit comments