Skip to content

Commit b2760e1

Browse files
committed
Merge branch 'topic/ci' into 'master'
Add '.git' prefix for URI of repositories. See merge request eng/ide/ada_language_server!1200
2 parents 7e1255d + 187677a commit b2760e1

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

.gitlab-ci.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,36 +80,32 @@ build_and_test:
8080
interruptible: true
8181
rules:
8282
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
83+
- if: $CI_PIPELINE_SOURCE == 'pipeline'
8384
- if: $CI_COMMIT_BRANCH == 'master' && $CI_COMMIT_TITLE =~ /Merge branch.*/
8485
- if: $CI_COMMIT_BRANCH == 'edge' && $CI_COMMIT_TITLE =~ /Merge branch.*/
8586
script:
8687
- !reference [.detect-branches]
8788

8889
- |
89-
ACI_SUBPROJECT_REPOSITORY_URL_PATH=/eng/ide/spawn
90+
ACI_SUBPROJECT_REPOSITORY_URL_PATH=/eng/ide/spawn.git
9091
ACI_SUBPROJECT_NAME=spawn
9192
- !reference [.checkout-subproject]
9293

9394
- |
94-
ACI_SUBPROJECT_REPOSITORY_URL_PATH=/eng/ide/vss
95+
ACI_SUBPROJECT_REPOSITORY_URL_PATH=/eng/ide/vss.git
9596
ACI_SUBPROJECT_NAME=vss
9697
- !reference [.checkout-subproject]
9798

9899
- |
99-
ACI_SUBPROJECT_REPOSITORY_URL_PATH=/eng/ide/markdown
100+
ACI_SUBPROJECT_REPOSITORY_URL_PATH=/eng/ide/markdown.git
100101
ACI_SUBPROJECT_NAME=markdown
101102
- !reference [.checkout-subproject]
102103

103104
- |
104-
ACI_SUBPROJECT_REPOSITORY_URL_PATH=/eng/ide/gnatdoc
105+
ACI_SUBPROJECT_REPOSITORY_URL_PATH=/eng/ide/gnatdoc.git
105106
ACI_SUBPROJECT_NAME=gnatdoc$ACI_REPOSITORY_NAME_EDGE_SUFFIX
106107
- !reference [.checkout-subproject]
107108

108-
- |
109-
ACI_SUBPROJECT_REPOSITORY_URL_PATH=/eng/ide/gnatstudio-internal
110-
ACI_SUBPROJECT_NAME=gnatstudio-internal$ACI_REPOSITORY_NAME_EDGE_SUFFIX
111-
- !reference [.checkout-subproject]
112-
113109
- if [[ "$ACI_TARGET_BRANCH" == "edge" ]]; then
114110
BUILD_SPACE_SUFFIX="_edge";
115111
fi

0 commit comments

Comments
 (0)