WIP

vespa-engine · Sep 3, 2024 · f771321 · f771321
1 parent 2b6d5f9
commit f771321
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 25 deletions.
diff --git a/.github/workflows/.yamllint b/.github/workflows/.yamllint
@@ -2,6 +2,8 @@
 extends: default
 
 rules:
+  document-start:
+    present: false
   line-length: disable
   truthy:
     check-keys: false
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -50,7 +50,6 @@ jobs:
     strategy:
       matrix:
         action-name: ${{fromJson(needs.prepare.outputs.container_names_json)}}
-        docker-platform: [linux/amd64, linux/arm64]
 
     env:
       REGISTRY: ghcr.io
@@ -90,8 +89,8 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          platforms: ${{ matrix.docker-platform }}
-          provenance: false # Bug: https://github.com/docker/build-push-action/issues/820
+          platforms: linux/amd64,linux/arm64
+          # Disable "provenance" vecause of this bug: https://github.com/docker/build-push-action/issues/820
+          provenance: false
           cache-from: type=gha
           cache-to: type=gha,mode=max
-
diff --git a/.github/workflows/jekyll-feed-to-vespa.yml b/.github/workflows/jekyll-feed-to-vespa.yml
@@ -17,14 +17,14 @@ defaults:
     shell: bash
 
 jobs:
-  lint:
+  build:
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v4
 
       - name: Build with Jekyll
-        uses: vespa-engine/gh-actions/jekyll-build-json@main
+        uses: vespa-engine/gh-actions/jekyll-build-json@fix-jekyll-build
         with:
           log_level: ${{ github.event.inputs.log_level }}
 

diff --git a/jekyll-build-json/Gemfile b/jekyll-build-json/Gemfile
@@ -4,14 +4,4 @@
 source "https://rubygems.org"
 
 # Manage our dependency on the version of the github-pages gem here.
-gem "github-pages", "= 232"
-
-# Explicitly include this gem here.
-# It is not directly included in the github-pages gem list of dependencies,
-# even though it is included in the original GitHub Pages build infrastructure.
-gem "jekyll-include-cache", "= 0.2.1"
-gem "jekyll-octicons", "~> 14.2"
-gem "minima", "~> 2.0"
-
-# Work-around for webrick no longer included in Ruby 3.0 (https://github.com/jekyll/jekyll/issues/8523)
-gem "webrick"
+gem 'github-pages', group: :jekyll_plugins
diff --git a/jekyll-build-json/action.yml b/jekyll-build-json/action.yml
@@ -16,12 +16,12 @@ inputs:
     default: ./_config.yml
   log_level:
     description: 'Log level for Jekyll build.'
-    required: false
+    required: true
     default: 'info'
   token:
     description: 'GitHub token'
     required: true
     default: ${{ github.token }}
 runs:
   using: 'docker'
-  image: 'docker://ghcr.io/vespa-engine/gh-actions/jekyll-build-json'
+  image: 'docker://ghcr.io/vespa-engine/gh-actions/jekyll-build-json:pr-14'
diff --git a/jekyll-build-json/entrypoint.sh b/jekyll-build-json/entrypoint.sh
@@ -17,7 +17,7 @@ JEKYLL_ARGS=("-p" "/opt/jekyll/plugins")
 export JEKYLL_ENV="production"
 export JEKYLL_GITHUB_TOKEN="${INPUT_TOKEN}"
 export JEKYLL_BUILD_REVISION="${GITHUB_SHA}"
-export JEKYLL_LOG_LEVEL="${INPUT_LOG_LEVEL}"
+export JEKYLL_LOG_LEVEL="${INPUT_LOG_LEVEL:-info}"
 
 if [[ "${JEKYLL_LOG_LEVEL}" = "verbose" || "${JEKYLL_LOG_LEVEL}" = "debug" ]]; then
   JEKYLL_ARGS+=("-V")

diff --git a/jekyll-build-json/vespa_index_generator.rb b/jekyll-build-json/vespa_index_generator.rb
@@ -11,9 +11,7 @@ class VespaIndexGenerator < Jekyll::Generator
         safe true
 
         def generate(site)
-          @site = site
-          puts "::debug::VespaIndexGenerator"
-            puts "site.config: #{(site.config).inspect}"
+            puts "::debug::VespaIndexGenerator"
 
             raise "Wrong parameter type, expected Jekyll::Site, got #{site.class}" unless site.is_a?(Jekyll::Site)
             raise "Search configuration not found" unless site.config.key?("search")
@@ -65,9 +63,12 @@ def generate(site)
             # File.open(__dir__ + namespace + "_index.json", "w") { |f| f.write(json) }
 
             puts "::debug::Writing index file: #{namespace}_index.json"
-            index_file = PageWithoutAFile.new(@site, __dir__, "", namespace + "_index.json")
+            index_file = PageWithoutAFile.new(site, site.source, "", "json_indexes/{namespace}_index.json")
             index_file.content = json
-            index_file.data["layout"] = nil
+            index_file.data.merge!(
+                "layout"     => nil,
+                "sitemap"    => false,
+            )
             index_file
         end