Add a module to re-define ENV["TZ"] in Windows
#5612
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
DST & Failing Test..
|
parkr
approved these changes
Nov 30, 2016
| @@ -84,6 +84,10 @@ def gemfile_contents | |||
| group :jekyll_plugins do | |||
| gem "jekyll-feed", "~> 0.6" | |||
| end | |||
|
|
|||
| # Windows does not include zoneinfo files, so bundle the tzinfo-data gem | |||
| gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] | |||
There was a problem hiding this comment.
How does this work when you don't have the gen installed?
There was a problem hiding this comment.
When the gem tzinfo-data is missing, Jekyll will raise MissingDependencyException w.r.t the parent gem tzinfo
Dependency Error: Yikes! It looks like you don't have tzinfo or one of its dependencies
installed. In order to use Jekyll as currently configured, you'll need to install this gem.
The full error message from Ruby is: 'cannot load such file -- tzinfo'
If you run into trouble, you can find helpful resources at http://jekyllrb.com/help/!
jekyll 3.3.1 | Error: tzinfo
If they then erroneously add gem tzinfo alone to their Gemfile and run Jekyll, then a TZInfo::DataSourceNotFound exception will be raised by tzinfo gem as Windows doesnt have a native zoneinfo source.:
jekyll 3.3.1 | Error: No source of timezone data could be found.
Please refer to http://tzinfo.github.io/datasourcenotfound for help resolving this error.
envygeeks
suggested changes
Nov 30, 2016
| @@ -119,7 +119,7 @@ def configuration(override = {}) | |||
| # Returns nothing | |||
| # rubocop:disable Style/AccessorMethodName | |||
| def set_timezone(timezone) | |||
| ENV["TZ"] = timezone | |||
| ENV["TZ"] = Utils::Platforms.windows? ? Utils::WinTZ.calculate(timezone) : timezone | |||
There was a problem hiding this comment.
This needs to be really_windows?. BashOnWindows uses GNU/Utils.
|
@DirtyF I've added a small piece of documentation to go along with this pull. |
ghost
approved these changes
Dec 6, 2016
this set of steps allow the test to pass when DST in not currently active. They may fail when DST becomes active.
|
@jekyllbot: merge +bug |
jekyllbot
added a commit
that referenced
this pull request
Dec 9, 2016
parkr
pushed a commit
that referenced
this pull request
Dec 16, 2016
parkr
added a commit
that referenced
this pull request
Dec 16, 2016
* master: (40 commits) Update history to reflect merge of #5658 [ci skip] Fix a couple of typos in the docs Update history to reflect merge of #5657 [ci skip] Update variables.md Update history to reflect merge of #5653 [ci skip] Improve Permalinks documentation. Update history to reflect merge of #5652 [ci skip] Use `assert_nil` instead of `assert_equal nil` Update history to reflect merge of #5513 [ci skip] Ignore symlinked file in windows Update history to reflect merge of #5612 [ci skip] Update history to reflect merge of #5643 [ci skip] Update Core team list in README Update history to reflect merge of #5641 [ci skip] use backticks for Gemfile for consistency since in the next sentence _config.yml file has backtick add a set of steps in site_configuration.feature update documentation for Windows narrow it down to only Windows revert and adjust site_configuration.feature add 'tzinfo-data' gem to generated Gemfile ...
5 tasks
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Finally managed to crack this issue.
With this in place, Jekyll on Windows will be able to reset
ENV["TZ"]to the IANA TimeZone specified in theconfig.ymlPoints To Consider:
gem "tzinfo-data"UTC-04:00etc as a workaround. Those sites will essentially require a re-configuring.--
Addresses: #5414
/cc @jekyll/windows