Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

travis: warn about differing .travis.yml #4921

Merged
merged 2 commits into from Mar 3, 2016
Merged

travis: warn about differing .travis.yml #4921

merged 2 commits into from Mar 3, 2016

Conversation

miri64
Copy link
Member

@miri64 miri64 commented Feb 28, 2016

Fixes #4920 in the most simplest way: just warn about the differing .travis.yml.

@miri64 miri64 added Area: tests Area: tests and testing framework Area: CI Area: Continuous Integration of RIOT components labels Feb 28, 2016
@miri64 miri64 added this to the Release 2016.03 milestone Feb 28, 2016
@miri64
Copy link
Member Author

miri64 commented Feb 28, 2016

2edd3cd is just there for testing and will be removed before merging.

@miri64 miri64 added the CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable label Feb 28, 2016
@miri64
Copy link
Member Author

miri64 commented Feb 28, 2016

Added check if .travis.yml was changed in the current PR (and don't warn in that case of course). Refer to https://travis-ci.org/RIOT-OS/RIOT/jobs/112449280 to see what happens if .travis.yml was changed in master and to https://travis-ci.org/RIOT-OS/RIOT/jobs/112449871 to see what happens if .travis.yml was changed in the current PR.

@OlegHahm OlegHahm added the Community: Hack'n'ACK candidate This PR is a candidate for review and discussion during one of RIOT's monthly Hack'n'ACK parties label Feb 28, 2016
@miri64 miri64 mentioned this pull request Feb 29, 2016
Closed
cgundogan
cgundogan reviewed Mar 1, 2016
View reviewed changes
.travis.yml
@@ -1,6 +1,7 @@
sudo: required
dist: trusty


Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

look at the commit message ;-) this is a test commit.

@cgundogan
Copy link
Member

this PR does not fix #4920 if the travis file is unmodified, but the test scripts changed

@miri64
Copy link
Member Author

miri64 commented Mar 1, 2016

this PR does not fix #4920 if the travis file is unmodified, but the test scripts changed

A change of the test scripts is not an issue and has nothing to do with #4920. Changes to the test scripts are included via https://github.com/RIOT-OS/RIOT/blob/master/dist/tools/travis-scripts/build_and_test.sh#L31.

@miri64
Copy link
Member Author

miri64 commented Mar 1, 2016

Ah, but what if build_and_test.sh changed… got yah.

@miri64
Copy link
Member Author

miri64 commented Mar 1, 2016

Added a test if the build_and_test.sh script changed and recalls it after the rebase if need be.

@cgundogan
Copy link
Member

officially: ACK

@cgundogan
Copy link
Member

and please squash

@miri64 miri64 force-pushed the travis/fix/warn-on-config-change branch from 6978e77 to 77bf527 Compare March 1, 2016 18:52
@miri64
Copy link
Member Author

miri64 commented Mar 1, 2016

Rebased.

@miri64 miri64 added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR and removed CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable labels Mar 1, 2016
@miri64 miri64 closed this Mar 1, 2016
@miri64 miri64 reopened this Mar 1, 2016
OlegHahm added a commit that referenced this pull request Mar 3, 2016
@OlegHahm
Merge pull request #4921 from authmillenon/travis/fix/warn-on-config-…
eb85eb5 
…change

travis: warn about differing .travis.yml
@OlegHahm OlegHahm merged commit eb85eb5 into RIOT-OS:master Mar 3, 2016
@miri64 miri64 deleted the travis/fix/warn-on-config-change branch March 11, 2016 19:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@OlegHahm OlegHahm

Labels
Area: CI Area: Continuous Integration of RIOT components Area: tests Area: tests and testing framework CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Community: Hack'n'ACK candidate This PR is a candidate for review and discussion during one of RIOT's monthly Hack'n'ACK parties
Projects
None yet
Milestone
Release 2016.04
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@miri64 @cgundogan @OlegHahm