You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
The reason will be displayed to describe this comment to others. Learn more.
True, maybe we should get a list of stuff we don't want to merge back to master.
Currently I'm thinking to:
Always: appveyor.yml .travis.yml
Unless it's a truffle release: truffle/pom.rb truffle/pom.xml truffle/.factorypath mx.jruby/suite.py
There is nothing as good as checking manually which files are changed by the merge though.
The reason will be displayed to describe this comment to others. Learn more.
https://www.appveyor.com/docs/branches/ but it's not bullet-proof as it will run on other truffle branches.
So the removed file is probably the only solution, unless we want a whitelist.
5634c88
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We'll need to watch this when we merge to master.
5634c88
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
True, maybe we should get a list of stuff we don't want to merge back to master.
Currently I'm thinking to:
Always:
appveyor.yml .travis.yml
Unless it's a truffle release:
truffle/pom.rb truffle/pom.xml truffle/.factorypath mx.jruby/suite.py
There is nothing as good as checking manually which files are changed by the merge though.
5634c88
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll see if there's a way in appveyor to just disable for a particular branch.
5634c88
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://www.appveyor.com/docs/branches/ but it's not bullet-proof as it will run on other truffle branches.
So the removed file is probably the only solution, unless we want a whitelist.