added *.Dockerfile filename extension #1059
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
webmaster777
force-pushed
the
add-dockerfile-extension
branch
3 times, most recently
from
8def6d3
to
8d1f1f6
Compare
|
I'm having issues with the bundler version required in the Gemfile and the one being used in the travis builds. I'm not sure how to fix this or whether it might have something to do with caching. This problem also occurs with other recent PRs. |
|
Funny this is that even though i made the version explicit, it still uses a different version: (from the build output) |
|
@webmaster777 I've submitted a PR (#1062) to set the specific bundler version, and remove the older Rubies from the CI setup and that works. I've asked @dblessing to confirm if he's ok with that approach. If not I'll see if there's another way of resolving this for the older Ruby versions. |
|
@webmaster777 I don't mean to make it sound like I'm playing you off against each other, but would you be able to update this to cover the additional case described in #1070? I'll merge in whichever is completed first. |
pyrmont
added
the
author-action
webmaster777
force-pushed
the
add-dockerfile-extension
branch
from
8d1f1f6
to
8eebbe5
Compare
|
Like this? |
|
Just like that :) |
pyrmont
removed
the
author-action
pyrmont
added a commit
that referenced
this pull request
Jul 4, 2020
In addition to adding the `*.Dockerfile` file glob, #1059 added a file glob for `Dockerfile_*` to address #1070. However, as noted by #1539, this causes issues for files that begin with `dockerfile_` but that are not Dockerfiles. Adding the `Dockerfile_*` file glob was an error and this commit removes it. It is a non-standard name and is not recognised by other syntax highlighting libraries (e.g. Pygments, Chroma, Linguist). The correct fix for the issue that precipitated #1070 is to use a `.gitattributes` file.
mattt
pushed a commit
to NSHipster/rouge
that referenced
this pull request
May 19, 2021
In addition to adding the `*.Dockerfile` file glob, rouge-ruby#1059 added a file glob for `Dockerfile_*` to address rouge-ruby#1070. However, as noted by rouge-ruby#1539, this causes issues for files that begin with `dockerfile_` but that are not Dockerfiles. Adding the `Dockerfile_*` file glob was an error and this commit removes it. It is a non-standard name and is not recognised by other syntax highlighting libraries (e.g. Pygments, Chroma, Linguist). The correct fix for the issue that precipitated rouge-ruby#1070 is to use a `.gitattributes` file.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closes #1058