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)
This commit is contained in:
parent
ad5c235a1c
commit
6e3f2a321e
2 changed files with 15 additions and 8 deletions
21
Makefile
21
Makefile
|
|
@ -244,7 +244,8 @@ FBAKE_ARGS := check-universal \
|
||||||
-j \
|
-j \
|
||||||
-x com.google.fonts/check/dsig \
|
-x com.google.fonts/check/dsig \
|
||||||
-x com.google.fonts/check/unitsperem \
|
-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_STATIC_ARGS := $(FBAKE_ARGS) -x com.google.fonts/check/family/underline_thickness
|
||||||
FBAKE_VAR_ARGS := $(FBAKE_ARGS) -x com.google.fonts/check/STAT_strings
|
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
|
# static text family
|
||||||
build/fbreport-text-const.txt: $(wildcard $(FONTDIR)/const/Inter-*.otf)
|
build/fbreport-text-const.txt: $(wildcard $(FONTDIR)/const/Inter-*.otf)
|
||||||
@echo "fontbakery check-universal 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"
|
@echo "fontbakery check-universal Inter-*.otf OK"
|
||||||
|
|
||||||
# multi-axis VF text family
|
# multi-axis VF text family
|
||||||
build/fbreport-text-var2.txt: $(FONTDIR)/var/Inter.var.ttf
|
build/fbreport-text-var2.txt: $(FONTDIR)/var/Inter.var.ttf
|
||||||
@echo "fontbakery check-universal 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"
|
@echo "fontbakery check-universal Inter.var.ttf"
|
||||||
|
|
||||||
# single-axis VF text family
|
# single-axis VF text family
|
||||||
build/fbreport-text-var1.txt: $(wildcard $(FONTDIR)/var/Inter-*.var.ttf)
|
build/fbreport-text-var1.txt: $(wildcard $(FONTDIR)/var/Inter-*.var.ttf)
|
||||||
@echo "fontbakery check-universal 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"
|
@echo "fontbakery check-universal Inter-*.var.ttf"
|
||||||
|
|
||||||
|
|
||||||
# static display family
|
# static display family
|
||||||
build/fbreport-display-const.txt: $(wildcard $(FONTDIR)/const/InterDisplay-*.otf)
|
build/fbreport-display-const.txt: $(wildcard $(FONTDIR)/const/InterDisplay-*.otf)
|
||||||
@echo "fontbakery check-universal 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"
|
@echo "fontbakery check-universal InterDisplay-*.otf"
|
||||||
|
|
||||||
# multi-axis VF display family
|
# multi-axis VF display family
|
||||||
build/fbreport-display-var2.txt: $(FONTDIR)/var/InterDisplay.var.ttf
|
build/fbreport-display-var2.txt: $(FONTDIR)/var/InterDisplay.var.ttf
|
||||||
@echo "fontbakery check-universal 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"
|
@echo "fontbakery check-universal InterDisplay.var.ttf"
|
||||||
|
|
||||||
# single-axis VF display family
|
# single-axis VF display family
|
||||||
build/fbreport-display-var1.txt: $(wildcard $(FONTDIR)/var/InterDisplay-*.var.ttf)
|
build/fbreport-display-var1.txt: $(wildcard $(FONTDIR)/var/InterDisplay-*.var.ttf)
|
||||||
@echo "fontbakery check-universal 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"
|
@echo "fontbakery check-universal InterInterDisplay-*.var.ttf"
|
||||||
|
|
||||||
# check does the same thing as test, but without any dependency checks, meaning
|
# check does the same thing as test, but without any dependency checks, meaning
|
||||||
|
|
|
||||||
|
|
@ -13,4 +13,4 @@ MutatorMath==3.0.1
|
||||||
brotli==1.0.9
|
brotli==1.0.9
|
||||||
|
|
||||||
# for QA
|
# for QA
|
||||||
fontbakery==0.7.34
|
fontbakery==0.7.37
|
||||||
|
|
|
||||||
Reference in a new issue