diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index ad278f1bb6c3..1426f80cbaa2 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -41,10 +41,9 @@ 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'
@@ -52,11 +51,11 @@ jobs:
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'
@@ -64,11 +63,11 @@ jobs:
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
diff --git a/.ruby-version b/.ruby-version
index b50214693056..15a279981720 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.0.2
+3.3.0
diff --git a/Gemfile b/Gemfile
index 782ce6a652b8..37a42ef42c31 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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
diff --git a/Rakefile b/Rakefile
index 6284c9efdd9d..088c73be6d98 100644
--- a/Rakefile
+++ b/Rakefile
@@ -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"]
diff --git a/_includes/blog_header.html b/_includes/blog_header.html
index 0e13a6d097fd..44d4877555aa 100644
--- a/_includes/blog_header.html
+++ b/_includes/blog_header.html
@@ -45,21 +45,21 @@
{% endcapture %}{% assign discard = nil %}
- Published
-
+ Published
+
{{ page.date | date_to_string }}
- By
+ By
{% if author_name %}
- {{ author_name }} ({{ page.author }})
+ {{ author_name }} ({{ page.author }})
{% else %}
{{ page.author }}
{% endif %}
{% if page.translations %}
- Translations
+ Translations
{% for trans in page.translations %}
{{ trans.language }}
{% endfor %}
diff --git a/_includes/header.html b/_includes/header.html
index 65f8b5a7d408..0430aeeecb54 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -1,8 +1,9 @@