Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RIOT
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cm-projects
RIOT
Commits
c239e359
Commit
c239e359
authored
9 years ago
by
Martine Lenders
Browse files
Options
Downloads
Patches
Plain Diff
travis: warn about differing .travis.yml
parent
0e285e89
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dist/tools/travis-scripts/build_and_test.sh
+15
-0
15 additions, 0 deletions
dist/tools/travis-scripts/build_and_test.sh
with
15 additions
and
0 deletions
dist/tools/travis-scripts/build_and_test.sh
+
15
−
0
View file @
c239e359
...
...
@@ -28,6 +28,21 @@ then
then
RESULT
=
0
if
git diff master HEAD
--
.travis.yml &> /dev/null
;
then
# check if .travis.yml was changed in the current PR and skip if so
if
!
git diff
--name-only
$(
git merge-base HEAD master
)
..HEAD
--
\
.travis.yml &> 1
;
then
echo
"=============================================================="
>
&2
echo
-e
"
\0
33[1;31m.travis.yml differs in upstream.
\0
33[0m"
echo
-e
"
\0
33[1;31mPlease rebase your PR to current upstream or expect errors!!!!
\0
33[0m"
>
&2
echo
" git fetch https://github.com/RIOT-OS/RIOT master"
>
&2
echo
" git rebase FETCH_HEAD"
>
&2
echo
" git push -f origin
$(
git rev-parse
--abbrev-ref
HEAD
)
"
>
&2
echo
"=============================================================="
>
&2
return
1
fi
fi
git rebase master
||
git rebase
--abort
RESULT
=
$(
set_result
$?
$RESULT
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment