diff options
author | Rasmus Andersson <rasmus@notion.se> | 2021-06-18 23:41:56 +0300 |
---|---|---|
committer | Rasmus Andersson <rasmus@notion.se> | 2021-06-18 23:41:56 +0300 |
commit | 6e3f2a321ef2a87f4a47f98ea1a62b047163c2c7 (patch) | |
tree | 9bf7ad611ecfb7f723fd18dd32fe02ede0f8e6af | |
parent | ad5c235a1c228b55b8ccbd5d102ca683a4f2f0f0 (diff) | |
download | inter-6e3f2a321ef2a87f4a47f98ea1a62b047163c2c7.tar.xz |
tooling: upgrade fontbakery and make sure that when it fails, the log files does not date after the source files (or make test will no re-run fontbakery)
-rw-r--r-- | Makefile | 21 | ||||
-rw-r--r-- | requirements.txt | 2 |
2 files changed, 15 insertions, 8 deletions
@@ -244,7 +244,8 @@ FBAKE_ARGS := check-universal \ -j \ -x com.google.fonts/check/dsig \ -x com.google.fonts/check/unitsperem \ - -x com.google.fonts/check/family/win_ascent_and_descent + -x com.google.fonts/check/family/win_ascent_and_descent \ + -x com.google.fonts/check/fontbakery_version FBAKE_STATIC_ARGS := $(FBAKE_ARGS) -x com.google.fonts/check/family/underline_thickness FBAKE_VAR_ARGS := $(FBAKE_ARGS) -x com.google.fonts/check/STAT_strings @@ -252,38 +253,44 @@ FBAKE_VAR_ARGS := $(FBAKE_ARGS) -x com.google.fonts/check/STAT_strings # static text family build/fbreport-text-const.txt: $(wildcard $(FONTDIR)/const/Inter-*.otf) @echo "fontbakery check-universal Inter-*.otf > $(@) ..." - @$(BIN)/fontbakery $(FBAKE_STATIC_ARGS) $^ > $@ || (cat $@; exit 1) + @$(BIN)/fontbakery $(FBAKE_STATIC_ARGS) $^ > $@ || \ + (cat $@; echo "report at $@"; touch -m -t 199001010000 $@; exit 1) @echo "fontbakery check-universal Inter-*.otf OK" # multi-axis VF text family build/fbreport-text-var2.txt: $(FONTDIR)/var/Inter.var.ttf @echo "fontbakery check-universal Inter.var.ttf > $(@) ..." - @$(BIN)/fontbakery $(FBAKE_VAR_ARGS) $^ > $@ || (cat $@; exit 1) + @$(BIN)/fontbakery $(FBAKE_VAR_ARGS) $^ > $@ || \ + (cat $@; echo "report at $@"; touch -m -t 199001010000 $@; exit 1) @echo "fontbakery check-universal Inter.var.ttf" # single-axis VF text family build/fbreport-text-var1.txt: $(wildcard $(FONTDIR)/var/Inter-*.var.ttf) @echo "fontbakery check-universal Inter-*.var.ttf > $(@) ..." - @$(BIN)/fontbakery $(FBAKE_VAR_ARGS) $^ > $@ || (cat $@; exit 1) + @$(BIN)/fontbakery $(FBAKE_VAR_ARGS) $^ > $@ || \ + (cat $@; echo "report at $@"; touch -m -t 199001010000 $@; exit 1) @echo "fontbakery check-universal Inter-*.var.ttf" # static display family build/fbreport-display-const.txt: $(wildcard $(FONTDIR)/const/InterDisplay-*.otf) @echo "fontbakery check-universal InterDisplay-*.otf > $(@) ..." - @$(BIN)/fontbakery $(FBAKE_STATIC_ARGS) $^ > $@ || (cat $@; exit 1) + @$(BIN)/fontbakery $(FBAKE_STATIC_ARGS) $^ > $@ || \ + (cat $@; echo "report at $@"; touch -m -t 199001010000 $@; exit 1) @echo "fontbakery check-universal InterDisplay-*.otf" # multi-axis VF display family build/fbreport-display-var2.txt: $(FONTDIR)/var/InterDisplay.var.ttf @echo "fontbakery check-universal InterDisplay.var.ttf > $(@) ..." - @$(BIN)/fontbakery $(FBAKE_VAR_ARGS) $^ > $@ || (cat $@; exit 1) + @$(BIN)/fontbakery $(FBAKE_VAR_ARGS) $^ > $@ || \ + (cat $@; echo "report at $@"; touch -m -t 199001010000 $@; exit 1) @echo "fontbakery check-universal InterDisplay.var.ttf" # single-axis VF display family build/fbreport-display-var1.txt: $(wildcard $(FONTDIR)/var/InterDisplay-*.var.ttf) @echo "fontbakery check-universal InterDisplay-*.var.ttf > $(@) ..." - @$(BIN)/fontbakery $(FBAKE_VAR_ARGS) $^ > $@ || (cat $@; exit 1) + @$(BIN)/fontbakery $(FBAKE_VAR_ARGS) $^ > $@ || \ + (cat $@; echo "report at $@"; touch -m -t 199001010000 $@; exit 1) @echo "fontbakery check-universal InterInterDisplay-*.var.ttf" # check does the same thing as test, but without any dependency checks, meaning diff --git a/requirements.txt b/requirements.txt index 2c59f2176..732c56234 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,4 +13,4 @@ MutatorMath==3.0.1 brotli==1.0.9 # for QA -fontbakery==0.7.34 +fontbakery==0.7.37 |