From 723c7e9aec1fb5cb2c40514993be9131fbc229ee Mon Sep 17 00:00:00 2001 From: Raphael Date: Sat, 2 Apr 2022 10:33:12 -0400 Subject: Upgrade CI workflow (#111) * Cache dependencies on CI workflow * Use available fontforge version for CI action Avoid a dirty OS upgrade to get a newer version of FontForge, use what is available at Ubuntu 20.04 * Upgrade CI Workflow By using an appimage of FontForge, it's easier to install the latest version, to cache it, and there is no extra dependencies clashes with Ubuntu 20.04 * Make paths for fontforge absolute in makefile It's necessary because fontforge is an AppImage and requires it * Improve cache step on CI wget don't download a duplicate if file already exists * Generate base64 ascii encoded debug keystore That can be used to transfer the keystore to a Github Secret * Restore debug.keystore from github secrets Get the asc encoded keystore from github secrets, and decode it back to a bynary file inside the CI run. * Cleanup redundant lines and add explanation comment * runs-on ubuntu-latest Co-authored-by: Jules Aguillon * add *.keystore.asc to .gitignore * Clean up lines, adjust documentation * use CURDIR automatic makefile variable Co-authored-by: Jules Aguillon --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index bfb633b..6ad91b8 100644 --- a/Makefile +++ b/Makefile @@ -97,12 +97,12 @@ $(R_FILE): $(RES_FILES) $(MANIFEST_FILE) # Special font -SPECIAL_FONT_GLYPHS = $(wildcard srcs/special_font/*.svg) -SPECIAL_FONT_SCRIPT = srcs/special_font/build.pe +SPECIAL_FONT_GLYPHS = $(wildcard $(CURDIR)/srcs/special_font/*.svg) +SPECIAL_FONT_SCRIPT = $(CURDIR)/srcs/special_font/build.pe _build/assets/special_font.ttf: $(SPECIAL_FONT_SCRIPT) $(SPECIAL_FONT_GLYPHS) mkdir -p $(@D) - fontforge -lang=ff -script $(SPECIAL_FONT_SCRIPT) $@ $(SPECIAL_FONT_GLYPHS) + fontforge -lang=ff -script $(SPECIAL_FONT_SCRIPT) $(CURDIR)/$@ $(SPECIAL_FONT_GLYPHS) # Compile java classes and build classes.dex -- cgit v1.2.3