Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
esolitos authored and gitbutler-client committed Sep 3, 2024
1 parent 2b6d5f9 commit 8725760
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 8 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/.yamllint
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
extends: default

rules:
document-start:
present: false
line-length: disable
truthy:
check-keys: false
4 changes: 2 additions & 2 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
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
# 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

4 changes: 2 additions & 2 deletions .github/workflows/jekyll-feed-to-vespa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
4 changes: 2 additions & 2 deletions jekyll-build-json/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion jekyll-build-json/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion jekyll-build-json/vespa_index_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ 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, __dir__, "_vespa_json_indexes", namespace + "_index.json")
index_file.content = json
index_file.data["layout"] = nil
index_file
Expand Down

0 comments on commit 8725760

Please sign in to comment.