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
3cb09137
Commit
3cb09137
authored
Oct 23, 2020
by
Pierre-Alain Loizeau
Browse files
Fix path to and permission of CI script
parent
54d55011
Changes
2
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
3cb09137
...
...
@@ -17,7 +17,7 @@ RebaseCheck:
# 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
-
ci_
scripts/connect_upstream_repo.sh $CI_MERGE_REQUEST_PROJECT_URL
-
git fetch upstream
-
hash1=$(git show-ref upstream/master | cut -f1 -d' ')
-
hash2=$(git merge-base upstream/master origin/$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME)
...
...
@@ -48,7 +48,7 @@ LinearHistCheck:
# 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
-
ci_
scripts/connect_upstream_repo.sh $CI_MERGE_REQUEST_PROJECT_URL
-
git fetch upstream
-
count=$(git rev-list --min-parents=2 --count upstream/master..HEAD)
-
echo "${count}"
...
...
ci_scripts/connect_upstream_repo.sh
100644 → 100755
View file @
3cb09137
File mode changed from 100644 to 100755
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