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.
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
replace grunt-autoprefixer with gruntpostcss + autoprefixer #18068
Conversation
|
||
var generateCommonJSModule = require('./grunt/bs-commonjs-generator.js'); | ||
var configBridge = grunt.file.readJSON('./grunt/configBridge.json', { encoding: 'utf8' }); | ||
|
||
var browsers = [ | ||
'Android 2.3', |
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.
Use 2 spaces for indents
yes thanks, i see. Done. |
Any change in dist files? |
dist files are unchanged (as expected) |
Then it should be OK. |
map: true | ||
map: true, | ||
processors: [ | ||
mq4HoverShim.postprocessorFor({ hoverSelectorPrefix: '.bs-true-hover ' }), |
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.
needs to be indented another level
Modulo the indentation, LGTM. |
@bassjobsen: can you fetch and rebase and also take care of @cvrebert's comments? |
i will try it this weekend. I'm not sure if i do understand the rebase thing. |
Well i tried / try to do the rebase.
|
i do not understand why 31 files are change now? @XhmikosR should i better create a new PR now? |
You didn't do the rebase properly, which would account for the extra unwanted commits and file changes. |
I'd agree that it's easier and faster to make a new one @bassjobsen. I'd recommend this guide on how to rebase https://help.github.com/articles/about-git-rebase/ if you aren't familiar with it / don't do it often |
|
@XhmikosR for the sake of being complete, EDIT: I had the wrong syntax for |
okay thanks, i will create a new PR soon |
That is not in order to create a new PR... |
@XhmikosR yes i understand, i will repeat my changes on the latest version and add it to a new PR |
Good catch, indeed it does. |
@wolfy1339 yes i see, but https://github.com/bassjobsen/bootstrap/commit/52b5bd5ce99e2c125b16939ea6e0101381756b55 repairs this? |
That commit won't cut it either. You would need to rewrite the git history of your branch to only have your changes. |
Leave this open. I'm rebasing and merging this myself. |
@XhmikosR This is why I always recommend qualifying requests for rebases with "if you are comfortable+familiar with rebasing..." |
Rebased. Running Travis build: https://travis-ci.org/twbs/bootstrap/builds/90641415 |
Build failed. Retrying now that #17652 has been merged. |
There seems to be a problem installing |
Forcing npm@3 fixes that problem, but now some unrelated random RVM problem has raised its head: |
Filed travis-ci/travis-ci#5092. Travis is missing curl for some reason, which causes the RVM problem. |
Why did you need to upgrade Ruby anyway? I use 2.2 in another project of mine without any issues. |
env:
matrix:
- RUBY_VERSION=2.2
before_install:
- rvm install $RUBY_VERSION
- rvm use $RUBY_VERSION --fuzzy
- export GEMDIR=$(rvm gemdir) @cvrebert: try this, it should work. |
Also, we shouldn't force npm@3 either. I mean, I'm using 2.x locally just fine. Did you try to clear Travis cache just in case? |
@cvrebert: this seems to pass 9b50133 |
Didn't really need to upgrade Ruby. I was just grasping at straws when debugging the RVM issue.
@XhmikosR Looks good, you should open a PR for that. |
No, haven't tried clearing the Travis cache. |
Shouldn't I just merge that then? |
Nicely done: 7b19dfc |
For whatever reason, the RVM error is no longer occurring. |
Purged the caches and building one more time to verify whether npm@3 is truly necessary: |
Build failed. @XhmikosR Yup, npm@3 is needed to install from an npm@3 shrinkwrap, which is reasonable. I'm guessing you don't see it locally since you're probably not installing via shrinkwrap. |
@cvrebert: we don't use a v3.x shrinkwrap, do we? |
@XhmikosR npm v3 is the latest stable major version of npm and seems to the preinstalled version for Node.js v5. And it's compatible with Node.js v4. Since the shrinkwrap is only used internally, I don't see much reason to use an old version. |
Rebased and merged as 50c43bc. Thanks @bassjobsen! |
The thing is, I don't want to use v5.0.0 yet... This broke my branch and I will need to use npm 3.x to rebase it. |
No description provided.