Skip to content

Commit d10ba27

Browse files
committed
Merge branch 'topic/lsif' into 'master'
Enable run of CI on all branches. See merge request eng/ide/ada_language_server!1164
2 parents 0d4a24e + cc07bcd commit d10ba27

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ stages:
99
# Build and test with ANOD
1010
# TODO: add a build and test based on Alire in parallel to this.
1111
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'
1612
services:
1713
- image:sandbox
1814
- cpu:8
@@ -26,7 +22,7 @@ build_and_test:
2622
# Check whether we're in an MR targeting 'edge' and setup some
2723
# variables if so.
2824
- TARGET_BRANCH="master"
29-
- if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" = "edge" ]; then
25+
- if [ "x$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" = "xedge" ]; then
3026
echo "Targeting the edge branch." ;
3127
REPO_SUFFIX="-edge" ;
3228
BUILD_SPACE_SUFFIX="_edge" ;

0 commit comments

Comments
 (0)