Skip to content

Commit ff5563e

Browse files
committed
Try fixing the conflicts
1 parent 4ad3fdb commit ff5563e

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

.github/workflows/deploy.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ jobs:
1515
- name: Setup Ruby
1616
uses: ruby/setup-ruby@v1
1717
with:
18-
ruby-version: '3.0.2'
18+
ruby-version: '3.2'
19+
bundler-cache: true
1920
- name: Enable bundler cache
2021
uses: actions/cache@v4
2122
with:
@@ -25,7 +26,7 @@ jobs:
2526
${{ runner.os }}-gems-
2627
- name: Install deps
2728
run: |
28-
gem install bundler
29+
gem install bundler -v '~> 2.4.0'
2930
rm -rf vendor/bundle
3031
bundle config path vendor/bundle
3132
bundle install --jobs 4 --retry 3
@@ -44,6 +45,8 @@ jobs:
4445
fi
4546
echo "::set-output name=DEPLOY_BRANCH::gh-pages"
4647
- name: Deploy website
47-
run: yes | bash bin/deploy --verbose ${{ steps.setup.outputs.NO_PUSH }}
48-
--src ${{ steps.setup.outputs.SRC_BRANCH }}
49-
--deploy ${{ steps.setup.outputs.DEPLOY_BRANCH }}
48+
run: |
49+
bundle update
50+
yes | bash bin/deploy --verbose ${{ steps.setup.outputs.NO_PUSH }} \
51+
--src ${{ steps.setup.outputs.SRC_BRANCH }} \
52+
--deploy ${{ steps.setup.outputs.DEPLOY_BRANCH }}

.ruby-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.2.0

Gemfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
source 'https://rubygems.org'
22

33
gem "jekyll", ">= 3.6.3"
4-
54
gem 'jekyll-scholar', group: :jekyll_plugins
65
gem "webrick", "~> 1.7"
6+
7+
# Explicitly set uri version to avoid conflicts
8+
gem "uri", "~> 0.10.1"

0 commit comments

Comments
 (0)