Skip to content

Commit

Permalink
Update Ruby and javascript dependencies
Browse files Browse the repository at this point in the history
Put base url in Jekyll config to ensure rss feed has correct path
  • Loading branch information
bkmgit committed Jan 8, 2024
1 parent 90107a8 commit cb18597
Show file tree
Hide file tree
Showing 6 changed files with 342 additions and 337 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,34 +41,33 @@ jobs:
cache: "npm"
- name: Configure for production
run: |
echo "JEKYLL_BASE_URL=" >> ${GITHUB_ENV}
echo "ORIGIN=${{ github.repository }}" >> ${GITHUB_ENV}
echo "TARGET_BRANCH=asf-site" >> ${GITHUB_ENV}
echo >> _extra_config.yml
echo "base_url: " >> _extra_config.yml
if: |
github.event_name == 'push' &&
github.repository == 'apache/arrow-site'
- name: Configure for GitHub Pages on push to main branch
run: |
owner=$(jq --raw-output .repository.owner.login ${GITHUB_EVENT_PATH})
repository=$(jq --raw-output .repository.name ${GITHUB_EVENT_PATH})
echo "JEKYLL_BASE_URL=/${repository}" >> ${GITHUB_ENV}
echo "ORIGIN=${owner}/${repository}" >> ${GITHUB_ENV}
echo "TARGET_BRANCH=gh-pages" >> ${GITHUB_ENV}
# "url:" is for the opengraph tags, and it can't be relative
echo "url: https://${owner}.github.io/${repository}" >> _extra_config.yml
echo "url: https://${owner}.github.io" >> _extra_config.yml
echo "base_url: /${repository}" >> _extra_config.yml
if: |
github.event_name == 'push' &&
github.repository != 'apache/arrow-site'
- name: Configure for GitHub Pages on pull request
run: |
owner=$(jq --raw-output .pull_request.head.user.login ${GITHUB_EVENT_PATH})
repository=$(jq --raw-output .pull_request.head.repo.name ${GITHUB_EVENT_PATH})
echo "JEKYLL_BASE_URL=/${repository}" >> ${GITHUB_ENV}
echo "ORIGIN=${owner}/${repository}" >> ${GITHUB_ENV}
echo "TARGET_BRANCH=gh-pages" >> ${GITHUB_ENV}
# "url:" is for the opengraph tags, and it can't be relative
echo "url: https://${owner}.github.io/${repository}" >> _extra_config.yml
echo "url: https://${owner}.github.io" >> _extra_config.yml
echo "baseurl: /${repository}" >> _extra_config.yml
if: |
github.event_name == 'pull_request'
- name: Build
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.2
3.3.0
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
gem "webrick"

group :jekyll_plugins do
gem "jekyll-feed", "~> 0.6"
gem "jekyll-feed", "~> 0.17.0"
gem "jekyll-jupyter-notebook"
gem "jekyll-seo-tag"
end
2 changes: 0 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ task :default => :serve
desc "Generate site"
task :generate => webpacked_js do
command_line = ["jekyll", "build"]
base_url = ENV["JEKYLL_BASE_URL"]
command_line << "--baseurl=#{base_url}" if base_url
extra_config = ENV["JEKYLL_EXTRA_CONFIG"]
command_line << "--config=_config.yml,#{extra_config}" if extra_config
destination = ENV["JEKYLL_DESTINATION"]
Expand Down
Loading

0 comments on commit cb18597

Please sign in to comment.