Skip to content
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.

Sign up for GitHub

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

Improve bundle install failures #75

Merged
merged 3 commits into from
Oct 22, 2020
Merged

Improve bundle install failures #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1179a9f
Print helpful error message if bundle install fails
asbjornu Oct 22, 2020
236a885
Loosen version requirements and update gems
asbjornu Oct 22, 2020
16406ca
Automatically approve pull requests from Dependabot
asbjornu Oct 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .docker/entrypoint/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ end
gem 'concurrent-ruby'
gem 'docopt'
# Neccessary to prevent Jekyll errors. See https://github.com/github/personal-website/issues/166
gem 'faraday', '~> 1.1.0'
gem 'faraday', '> 1.0'
gem 'html-proofer'
gem 'html-proofer-unrendered-markdown'
gem 'rake', '~> 13.0'
gem 'rake'

group :development, :test do
gem 'diffy'
Expand Down
12 changes: 6 additions & 6 deletions .docker/entrypoint/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (6.0.3.3)
activesupport (6.0.3.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
Expand All @@ -19,7 +19,7 @@ GEM
diffy (3.4.0)
docile (1.3.2)
docopt (0.6.1)
em-websocket (0.5.1)
em-websocket (0.5.2)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
ethon (0.12.0)
Expand Down Expand Up @@ -112,7 +112,7 @@ GEM
mini_portile2 (~> 2.4.0)
nokogumbo (2.0.2)
nokogiri (~> 1.8, >= 1.8.4)
octokit (4.18.0)
octokit (4.19.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
open3 (0.1.0)
Expand All @@ -135,7 +135,7 @@ GEM
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
rspec-core (3.9.2)
rspec-core (3.9.3)
rspec-support (~> 3.9.3)
rspec-expectations (3.9.2)
diff-lcs (>= 1.2.0, < 2.0)
Expand Down Expand Up @@ -203,7 +203,7 @@ DEPENDENCIES
concurrent-ruby
diffy
docopt
faraday (~> 1.1.0)
faraday (> 1.0)
html-proofer
html-proofer-unrendered-markdown
jekyll (~> 4.1.1)
Expand All @@ -213,7 +213,7 @@ DEPENDENCIES
jekyll-remote-theme
jemoji
kramdown-plantuml
rake (~> 13.0)
rake
rouge
rspec
rubocop
Expand Down
8 changes: 5 additions & 3 deletions .docker/entrypoint/sh/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,11 @@ main() {

default_gemfile="${JEKYLL_DATA_DIR}/Gemfile.generated"

bundle check --gemfile="$default_gemfile" \
|| bundle install --gemfile="$default_gemfile"
if ! bundle check --gemfile="$default_gemfile"; then
if ! bundle install --gemfile="$default_gemfile"; then
echo "Bundle install failed. Try removing Gemfile.lock and try again." 1>&2
fi
fi

if [[ -n $env ]]; then
[ $verbose ] && echo "Exporting JEKYLL_ENV='$env'."
Expand All @@ -45,4 +48,3 @@ main() {
}

main "$@"

13 changes: 13 additions & 0 deletions .github/workflows/auto-review-pull-requests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Automatic pull request review
on: [pull_request]
jobs:
automate-pullrequest-review:
runs-on: ubuntu-latest
steps:
- name: Approve pull request
if: contains(github.actor, 'dependabot')
uses: andrewmusgrave/automatic-pull-request-review@0.0.2
with:
repo-token: '${{ secrets.GITHUB_TOKEN }}'
event: APPROVE
body: 'Thank you dependabot 🎊'