Skip to content

Commit

Permalink
Update to bundler v2
Browse files Browse the repository at this point in the history
Bundle v1.x is pretty old now...
  • Loading branch information
PeterJCLaw committed Mar 27, 2024
1 parent 5feaf54 commit 8a24b7b
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
cache-version: 2
cache-version: 3

- name: Build & Validate
run: rake validate
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ WORKDIR /usr/src/docs

RUN git config --global --add safe.directory /usr/src/docs && git config --global --add safe.directory /usr/src/docs/_sass/brand

RUN gem install 'bundler:~>1' rake
RUN gem install bundler rake

COPY . ./

Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -106,4 +106,4 @@ DEPENDENCIES
webrick (~> 1.7)

BUNDLED WITH
1.17.3
2.1.4
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ Once setup, the site will be accessible on http://localhost:4000/docs/

1. [Install Ruby][install-ruby]

2. Install Bundler (1.x) and Rake
2. Install Bundler (2.x) and Rake

``` shell
$ gem install 'bundler:~>1' rake
$ gem install bundler rake
```

3. Start the app in development mode
Expand Down
7 changes: 3 additions & 4 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ task :deep_clean => [:clean] do
end

task :dependencies do
if ENV["GLOBAL_GEMS"]
sh('bundle install')
else
sh('bundle install --path gems')
if ! ENV["GLOBAL_GEMS"]
sh('bundle config set --local path "gems"')
end
sh('bundle install')

# Fix pathutil on Ruby 3; works around https://github.com/envygeeks/pathutil/pull/5
# as suggested by https://stackoverflow.com/a/73909894/67873
Expand Down

0 comments on commit 8a24b7b

Please sign in to comment.