mirror of
https://github.com/storytold/lightcraft.git
synced 2026-10-24 10:09:01 -06:00
CI: the packaging scripts check out the craft-fonts revision release.yml pins (3d9ab3a, with Noto Sans Thai)
Windows ARM64 on main failed since batch 36: #1479's scripts pinned 8dcdacd, which predates the Thai face #1311 made required. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5.5
parent
a22f9a6d46
commit
fd9d045c75
+1
-1
@@ -66,7 +66,7 @@ the web build requires BIZ UDPGothic Regular and packages Noto Sans CJK SC as a
|
|||||||
|
|
||||||
Local macOS, Linux and Windows packaging scripts automatically use the sibling `../craft-fonts`
|
Local macOS, Linux and Windows packaging scripts automatically use the sibling `../craft-fonts`
|
||||||
checkout. If it is absent, they clone it at revision
|
checkout. If it is absent, they clone it at revision
|
||||||
`8dcdacd5153e64560d109541a47d806f26f048c0` (keep the pins in `packaging/fonts.sh` and
|
`3d9ab3a132ed0eff457e424226a435a901da30d3` (keep the pins in `packaging/fonts.sh` and
|
||||||
`packaging/windows/fonts.ps1` in sync with the release workflow). Existing checkouts are left untouched.
|
`packaging/windows/fonts.ps1` in sync with the release workflow). Existing checkouts are left untouched.
|
||||||
Set `CRAFT_FONTS_DIR` to use another
|
Set `CRAFT_FONTS_DIR` to use another
|
||||||
checkout; relative paths resolve from the workspace root. The script requires the Chinese and Japanese
|
checkout; relative paths resolve from the workspace root. The script requires the Chinese and Japanese
|
||||||
|
|||||||
+1
-1
@@ -10,7 +10,7 @@ prepare_fonts() {
|
|||||||
|
|
||||||
if [ -z "${CRAFT_FONTS_DIR:-}" ] && [ ! -e "$font_dir" ]; then
|
if [ -z "${CRAFT_FONTS_DIR:-}" ] && [ ! -e "$font_dir" ]; then
|
||||||
# Same revision as release.yml. Never update or reset an existing checkout.
|
# Same revision as release.yml. Never update or reset an existing checkout.
|
||||||
local revision=8dcdacd5153e64560d109541a47d806f26f048c0
|
local revision=3d9ab3a132ed0eff457e424226a435a901da30d3
|
||||||
echo "==> downloading craft-fonts ($revision) to $font_dir"
|
echo "==> downloading craft-fonts ($revision) to $font_dir"
|
||||||
if ! git clone --no-checkout https://github.com/storytold/craft-fonts "$font_dir" ||
|
if ! git clone --no-checkout https://github.com/storytold/craft-fonts "$font_dir" ||
|
||||||
! git -C "$font_dir" checkout --detach "$revision"; then
|
! git -C "$font_dir" checkout --detach "$revision"; then
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ function Initialize-CraftFonts([string] $WorkspaceRoot) {
|
|||||||
|
|
||||||
if (-not $env:CRAFT_FONTS_DIR -and -not (Test-Path -LiteralPath $fontDir)) {
|
if (-not $env:CRAFT_FONTS_DIR -and -not (Test-Path -LiteralPath $fontDir)) {
|
||||||
# Same revision as release.yml and packaging/fonts.sh. Existing checkouts stay untouched.
|
# Same revision as release.yml and packaging/fonts.sh. Existing checkouts stay untouched.
|
||||||
$revision = '8dcdacd5153e64560d109541a47d806f26f048c0'
|
$revision = '3d9ab3a132ed0eff457e424226a435a901da30d3'
|
||||||
Write-Output "==> downloading craft-fonts ($revision) to $fontDir"
|
Write-Output "==> downloading craft-fonts ($revision) to $fontDir"
|
||||||
& git clone --no-checkout https://github.com/storytold/craft-fonts $fontDir
|
& git clone --no-checkout https://github.com/storytold/craft-fonts $fontDir
|
||||||
if ($LASTEXITCODE -ne 0) { throw 'Could not download craft-fonts; provide a complete checkout with CRAFT_FONTS_DIR' }
|
if ($LASTEXITCODE -ne 0) { throw 'Could not download craft-fonts; provide a complete checkout with CRAFT_FONTS_DIR' }
|
||||||
|
|||||||
Reference in New Issue
Block a user