Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Rishat Sultanov
cbmroot_geometry
Commits
54d55011
Commit
54d55011
authored
Oct 23, 2020
by
Pierre-Alain Loizeau
Browse files
Change CI runner to docker
parent
fcebecb7
Changes
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
54d55011
...
...
@@ -3,8 +3,9 @@ stages:
RebaseCheck
:
stage
:
checkRepository
image
:
alpine
tags
:
-
CbmRoot
-
docker
only
:
refs
:
-
merge_requests
...
...
@@ -15,6 +16,7 @@ RebaseCheck:
# comparison
# Check if a rebase is needed
# If a rebase is needed stop immediately
-
apk update && apk add git bash
-
scripts/connect_upstream_repo.sh $CI_MERGE_REQUEST_PROJECT_URL
-
git fetch upstream
-
hash1=$(git show-ref upstream/master | cut -f1 -d' ')
...
...
@@ -32,8 +34,9 @@ RebaseCheck:
LinearHistCheck
:
stage
:
checkRepository
image
:
alpine
tags
:
-
CbmRoot
-
docker
only
:
refs
:
-
merge_requests
...
...
@@ -44,6 +47,7 @@ LinearHistCheck:
# comparison
# Check if the history introduced by the MR is linear (no branch loop in fork)
# If not linear stop immediately
-
apk update && apk add git bash
-
scripts/connect_upstream_repo.sh $CI_MERGE_REQUEST_PROJECT_URL
-
git fetch upstream
-
count=$(git rev-list --min-parents=2 --count upstream/master..HEAD)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment