From 4b923167745e2ff1b6ebe91bbd495da5635f0ee0 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Sun, 31 Mar 2024 00:05:38 -0500 Subject: [PATCH] Hebrew language build fix (#2464) --- .github/workflows/build.yml | 26 +++++++++++++++++++++----- .github/workflows/publish-release.yml | 4 ++-- config/layouts/page.yml | 9 ++++++++- theme/assets/brand | 2 +- 4 files changed, 32 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3503ecd4..15e2347f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,12 +80,21 @@ jobs: - uses: actions/cache/restore@v4.0.2 with: - key: site-cache-${{ inputs.repo }}-${{ inputs.lang }}-${{ inputs.ref }}-${{ hashfiles('.cache/**') }} + key: site-cache-${{ inputs.repo }}-${{ inputs.ref }}-${{ hashfiles('.cache/**') }} path: .cache restore-keys: | - site-cache-${{ inputs.repo }}-${{ inputs.lang }}-${{ inputs.ref }}- - site-cache-${{ inputs.repo }}-${{ inputs.lang }}- - site-cache-${{ github.repository }}-${{ inputs.lang }} + site-cache-${{ inputs.repo }}-${{ inputs.ref }}- + site-cache-${{ inputs.repo }}- + + - uses: actions/cache/restore@v4.0.2 + with: + key: card-cache-${{ inputs.repo }}-${{ inputs.lang }}-${{ inputs.ref }}-${{ hashfiles('config/.cache/plugin/social/manifest.json') }} + path: | + config/.cache/plugin/social/manifest.json + config/.cache/plugin/social/assets + restore-keys: | + card-cache-${{ inputs.repo }}-${{ inputs.lang }}-${{ inputs.ref }}- + card-cache-${{ inputs.repo }}-${{ inputs.lang }}- - run: | pip install pipenv @@ -110,9 +119,16 @@ jobs: - uses: actions/cache/save@v4.0.2 with: - key: site-cache-${{ inputs.repo }}-${{ inputs.lang }}-${{ inputs.ref }}-${{ hashfiles('.cache/**') }} + key: site-cache-${{ inputs.repo }}-${{ inputs.ref }}-${{ hashfiles('.cache/**') }} path: .cache + - uses: actions/cache/save@v4.0.2 + with: + key: card-cache-${{ inputs.repo }}-${{ inputs.lang }}-${{ inputs.ref }}-${{ hashfiles('config/.cache/plugin/social/manifest.json') }} + path: | + config/.cache/plugin/social/manifest.json + config/.cache/plugin/social/assets + - uses: actions/upload-artifact@v4 with: name: site-build-${{ inputs.lang }}.tar.gz diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index eb035bc9..7121cb84 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -50,8 +50,8 @@ jobs: contents: read uses: ./.github/workflows/build.yml with: - ref: ${{ github.repository }} - repo: ${{ github.ref }} + ref: ${{ github.ref }} + repo: ${{ github.repository }} lang: ${{ matrix.lang }} context: production continue-on-error: false diff --git a/config/layouts/page.yml b/config/layouts/page.yml index 3223f747..99f53186 100644 --- a/config/layouts/page.yml +++ b/config/layouts/page.yml @@ -26,6 +26,13 @@ definitions: Bagnard {%- endif -%} + - &title_font_style >- + {%- if config.theme.language == "he" -%} + Regular + {%- else -%} + Bold + {%- endif -%} + - &font_family >- {%- if config.theme.language == "he" -%} Suez One @@ -128,7 +135,7 @@ layers: height: 1.5 font: family: *title_font_family - style: Bold + style: *title_font_style # Page description - size: { width: 864, height: 96 } diff --git a/theme/assets/brand b/theme/assets/brand index 67166ed8..872a38c6 160000 --- a/theme/assets/brand +++ b/theme/assets/brand @@ -1 +1 @@ -Subproject commit 67166ed8b641d8ac1837d0b75329e02ed4056704 +Subproject commit 872a38c628780050bb3217a8c7fea9922b059717