Fix obscured gemfile issue #912
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
I’ve specified the BUNDLE_GEMFILE as the one that exists in the /src/site location (the source of the site being built) was preventing Jekyll from finding the installed dependencies.
|
Is there anything else that the team need to support this change? Please let me know if there’s anything else I can do to get it merged. |
parkr
approved these changes
Mar 18, 2024
lib/github-pages/dependencies.rb
Outdated
| @@ -9,6 +9,7 @@ class Dependencies | |||
| # Jekyll | |||
| "jekyll" => "3.9.5", | |||
| "jekyll-sass-converter" => "1.5.2", | |||
| "webrick" => "1.8.1", | |||
There was a problem hiding this comment.
Now that everything is upgraded to Ruby 3, I'd recommend this for sure 👍
|
I might recommend separating the addition of the webrick and the modification of the docket files into two separate PRs. Otherwise LGTM. |
mrmanc
force-pushed
the
fix-obscured-gemfile-issue
branch
from
4012662
to
7292abd
Compare
Thanks—I’ve done as you’ve suggested 😃. I’m guessing you aren’t able to act on this yourself? |
parkr
approved these changes
Mar 23, 2024
yoannchaudet
approved these changes
Jul 18, 2024
TomHennen
added a commit
to slsa-framework/slsa
that referenced
this pull request
Aug 21, 2024
[](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github-pages](https://togithub.com/github/pages-gem) | `231` -> `232` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>github/pages-gem (github-pages)</summary> ### [`v232`](https://togithub.com/github/pages-gem/releases/tag/v232) [Compare Source](https://togithub.com/github/pages-gem/compare/v231...v232) #### What's Changed - Bump docker/build-push-action from 5 to 6 by [@​dependabot](https://togithub.com/dependabot) in [github/pages-gem#916 - Fix obscured gemfile issue by [@​mrmanc](https://togithub.com/mrmanc) in [github/pages-gem#912 - Add webrick as Ruby 3 doesn’t include it by [@​mrmanc](https://togithub.com/mrmanc) in [github/pages-gem#914 - Update nokogiri CVE-2024-25062 by [@​naxhh](https://togithub.com/naxhh) in [github/pages-gem#911 - Parkr jekyll3.10 by [@​yoannchaudet](https://togithub.com/yoannchaudet) in [github/pages-gem#919 - Fix improperly bound regex by [@​yoannchaudet](https://togithub.com/yoannchaudet) in [github/pages-gem#921 - Prep 232 by [@​yoannchaudet](https://togithub.com/yoannchaudet) in [github/pages-gem#923 #### New Contributors - [@​naxhh](https://togithub.com/naxhh) made their first contribution in [github/pages-gem#911 **Full Changelog**: github/pages-gem@v231...v232 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "every weekend" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/slsa-framework/slsa). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4yNi4xIiwidXBkYXRlZEluVmVyIjoiMzguMjYuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==--> --------- Signed-off-by: Mend Renovate <bot@renovateapp.com> Signed-off-by: Tom Hennen <TomHennen@users.noreply.github.com> Co-authored-by: Tom Hennen <TomHennen@users.noreply.github.com>
andrewpollock
pushed a commit
to google/osv-scanner
that referenced
this pull request
Aug 22, 2024
[](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github-pages](https://togithub.com/github/pages-gem) | `"~> 231"` -> `"~> 232"` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>github/pages-gem (github-pages)</summary> ### [`v232`](https://togithub.com/github/pages-gem/releases/tag/v232) [Compare Source](https://togithub.com/github/pages-gem/compare/v231...v232) #### What's Changed - Bump docker/build-push-action from 5 to 6 by [@​dependabot](https://togithub.com/dependabot) in [github/pages-gem#916 - Fix obscured gemfile issue by [@​mrmanc](https://togithub.com/mrmanc) in [github/pages-gem#912 - Add webrick as Ruby 3 doesn’t include it by [@​mrmanc](https://togithub.com/mrmanc) in [github/pages-gem#914 - Update nokogiri CVE-2024-25062 by [@​naxhh](https://togithub.com/naxhh) in [github/pages-gem#911 - Parkr jekyll3.10 by [@​yoannchaudet](https://togithub.com/yoannchaudet) in [github/pages-gem#919 - Fix improperly bound regex by [@​yoannchaudet](https://togithub.com/yoannchaudet) in [github/pages-gem#921 - Prep 232 by [@​yoannchaudet](https://togithub.com/yoannchaudet) in [github/pages-gem#923 #### New Contributors - [@​naxhh](https://togithub.com/naxhh) made their first contribution in [github/pages-gem#911 **Full Changelog**: github/pages-gem@v231...v232 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "before 6am on monday" in timezone Australia/Sydney, Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/google/osv-scanner). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4yNi4xIiwidXBkYXRlZEluVmVyIjoiMzguMjYuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19-->
lehors
added a commit
to slsa-framework/slsa
that referenced
this pull request
Aug 27, 2024
](https://renovatebot.com){kind=link}
[](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github-pages](https://togithub.com/github/pages-gem) | `231` -> `232` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>github/pages-gem (github-pages)</summary> ### [`v232`](https://togithub.com/github/pages-gem/releases/tag/v232) [Compare Source](https://togithub.com/github/pages-gem/compare/v231...v232) #### What's Changed - Bump docker/build-push-action from 5 to 6 by [@​dependabot](https://togithub.com/dependabot) in [github/pages-gem#916 - Fix obscured gemfile issue by [@​mrmanc](https://togithub.com/mrmanc) in [github/pages-gem#912 - Add webrick as Ruby 3 doesn’t include it by [@​mrmanc](https://togithub.com/mrmanc) in [github/pages-gem#914 - Update nokogiri CVE-2024-25062 by [@​naxhh](https://togithub.com/naxhh) in [github/pages-gem#911 - Parkr jekyll3.10 by [@​yoannchaudet](https://togithub.com/yoannchaudet) in [github/pages-gem#919 - Fix improperly bound regex by [@​yoannchaudet](https://togithub.com/yoannchaudet) in [github/pages-gem#921 - Prep 232 by [@​yoannchaudet](https://togithub.com/yoannchaudet) in [github/pages-gem#923 #### New Contributors - [@​naxhh](https://togithub.com/naxhh) made their first contribution in [github/pages-gem#911 **Full Changelog**: github/pages-gem@v231...v232 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "every weekend" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/slsa-framework/slsa). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4yNi4xIiwidXBkYXRlZEluVmVyIjoiMzguMjYuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==--> --------- Signed-off-by: Mend Renovate <bot@renovateapp.com> Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com> Co-authored-by: Arnaud J Le Hors <lehors@us.ibm.com>
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.
(edited to include just one change per @parkr’s suggestion—see also stacked PR #914)
Fixes #891.
jekyllwas unable to find the gems which Bundler had installed as part of theDockerfilebecause it was finding aGemfilein the currently working directory (/src/site), which belongs to the site being built. I resolved this by setting an environment variable to tell Bundler where to find the correctGemfile.I’m not a Ruby developer, so I might not have done this conventionally. However it seems to work, and it was the minimum change I could make to resolve those issues.