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.

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

Upgrade Jekyll build to latest Ruby 3.2.2 from 2.7.8 (keep fontcustom on 2.7.8) #31

Merged
merged 6 commits into from
Nov 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 25 additions & 11 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ jobs:
with:
submodules: true

- name: "Setup Ruby"
- name: "Setup old Ruby."
uses: ruby/setup-ruby@v1
with:
#ruby-version: .ruby-version # So checkout is needed.
ruby-version: '2.7.8'
bundler-cache: true
cache-version: 0 # Increment this number if you need to re-download cached gems.

Expand All @@ -65,16 +65,23 @@ jobs:
sources/iconfont/iconfont-preview.html
if-no-files-found: error

- name: "Setup Pages"
- name: "Setup Ruby."
uses: ruby/setup-ruby@v1
with:
#ruby-version: .ruby-version # So checkout is needed.
bundler-cache: true
cache-version: 0 # Increment this number if you need to re-download cached gems.

- name: "Retrieve GitHub Pages configuration."
id: pages
uses: actions/configure-pages@v3

- name: "Build with Jekyll"
- name: "Build _site with Jekyll."
run: bundle exec jekyll build --trace --baseurl "${{ steps.pages.outputs.base_path }}"
env:
JEKYLL_ENV: production

- name: "Upload artifact"
- name: "Upload 'github-pages' artifact."
uses: actions/upload-pages-artifact@v2
with:
path: _site/
Expand Down Expand Up @@ -111,10 +118,10 @@ jobs:
runs-on: ubuntu-latest
steps:

- name: "Calculate relevant SHA"
- name: "Calculate relevant SHA."
id: params
run: |
echo "sha=${{ github.event.pull_request.base.sha || github.event.after }}" >> $GITHUB_OUTPUT
echo "sha=${{ github.event.pull_request.base.sha || github.event.after }}" >> "${GITHUB_OUTPUT}"

- name: "Load cached site."
id: cache
Expand All @@ -131,11 +138,10 @@ jobs:
submodules: true
ref: ${{ steps.params.outputs.sha }}

- name: "Setup Ruby."
if: steps.cache.outputs.cache-hit != 'true'
- name: "Setup old Ruby."
uses: ruby/setup-ruby@v1
with:
#ruby-version: .ruby-version # So checkout is needed.
ruby-version: '2.7.8'
bundler-cache: true
cache-version: 0 # Increment this number if you need to re-download cached gems.

Expand All @@ -144,11 +150,19 @@ jobs:
working-directory: sources/iconfont
run: ${{ github.workspace }}/.github/workflows/install-fontcustom.sh

- name: "Build iconfont"
- name: "Build iconfont."
if: steps.cache.outputs.cache-hit != 'true'
working-directory: sources/iconfont
run: fontcustom compile

- name: "Setup Ruby."
if: steps.cache.outputs.cache-hit != 'true'
uses: ruby/setup-ruby@v1
with:
#ruby-version: .ruby-version # So checkout is needed.
bundler-cache: true
cache-version: 0 # Increment this number if you need to re-download cached gems.

- name: "Retrieve GitHub Pages configuration."
if: steps.cache.outputs.cache-hit != 'true'
id: pages
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.8
3.2.2
1 change: 1 addition & 0 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ exclude:
- .project
- www.twisterrob.net.sublime-project # should be '*.sublime-project', see https://github.com/jekyll/jekyll-watch/issues/34
# Random stuff
- temp
- sources
- .svn
- .git
Expand Down
1 change: 1 addition & 0 deletions sources/iconfont/.ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.7.8
Loading