From e9591b588506295699c3f2aed1db88d0d8e48a84 Mon Sep 17 00:00:00 2001
From: Jeremy Rand <jeremyrand@airmail.cc>
Date: Thu, 24 Mar 2022 00:49:42 +0000
Subject: [PATCH] Bug 40186: fonts: Download .zip archive instead of Git clone
Reduces storage usage from >6 GiB to <40 MiB.
---
projects/fonts/build | 4 ++--
projects/fonts/config | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/projects/fonts/build b/projects/fonts/build
index a1e066bd4..14e297402 100644
--- a/projects/fonts/build
+++ b/projects/fonts/build
@@ -2,8 +2,8 @@
[% c("var/set_default_env") -%]
distdir=/var/tmp/dist/fonts
mkdir -p $distdir
-tar xf [% project %]-[% c("version") %].tar.gz
-ln -s [% project %]-[% c("version") %] noto-fonts
+unzip -o 720e34851382ee3c1ef024d8dffb68ffbfb234c2.zip
+mv noto-fonts-* noto-fonts
mkdir -p $distdir
[% FOREACH fontfile = c("var/noto_fonts_hinted");
GET 'cp "noto-fonts/hinted/' _ fontfile _ '" $distdir' _ "\n";
diff --git a/projects/fonts/config b/projects/fonts/config
index 9d11d2cbb..d708afdbb 100644
--- a/projects/fonts/config
+++ b/projects/fonts/config
@@ -1,7 +1,5 @@
# vim: filetype=yaml sw=2
-version: '[% c("abbrev") %]'
-git_url: https://github.com/googlei18n/noto-fonts.git
-git_hash: 720e34851382ee3c1ef024d8dffb68ffbfb234c2
+version: '1'
filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz"
var:
container:
@@ -87,6 +85,8 @@ targets:
input_files:
- project: container-image
+ - URL: https://github.com/googlefonts/noto-fonts/archive/720e34851382ee3c1ef024d8dffb68ffbfb234c2.zip
+ sha256sum: 26029b0b157e30ba063a759a1af859f849b7090162802a2cf57dfaad06849528
- URL: https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd05d6f382138a3d3adcd89c5ce800/fonts/NotoEmoji-Regular.ttf
sha256sum: 415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5
enable: '[% c("var/linux") %]'
--
GitLab