From 39952f8bdf2ee77e32152bf67df456a83e3e03fe Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Sun, 24 Apr 2022 20:52:36 +0200
Subject: Remove build dependency on Fontforge

The required version of fontforge (from 2020!) is not available in many
distros. This is an annoying for contributors and greatly complicated
the CI and F-Droid scripts.

The generated font file is now included in the sources. Fontforge is
still needed when adding new glyphs but this is not a common operation.
---
 .github/workflows/make-apk.yml | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/make-apk.yml b/.github/workflows/make-apk.yml
index 6457576..3f872ba 100644
--- a/.github/workflows/make-apk.yml
+++ b/.github/workflows/make-apk.yml
@@ -9,19 +9,6 @@ jobs:
   Build-Apk:
     runs-on: ubuntu-latest
     steps:
-    - name: Cache fontforge and extra dependencies
-      uses: actions/cache@v2
-      with:
-        path: /usr/local/bin
-        key: usr-local-bin
-    - name: Install latest FontForge version (using AppImage)
-      run: |
-        # Get most recent version of FontForge
-        # Using AppImage there is no dependecy problem, it is the latest version and it's easier to cache
-        cd /usr/local/bin
-        sudo wget -c -N https://github.com/fontforge/fontforge/releases/download/20220308/FontForge-2022-03-08-582bd41-x86_64.AppImage
-        sudo chmod +x ./FontForge-2022-03-08-582bd41-x86_64.AppImage
-        sudo ln --symbolic --force /usr/local/bin/FontForge-2022-03-08-582bd41-x86_64.AppImage /usr/local/bin/fontforge
     - uses: actions/setup-java@v2
       with:
         distribution: 'zulu' # See 'Supported distributions' for available options
@@ -36,11 +23,11 @@ jobs:
     - name: Restore debug keystore from github Secrets 
       run: |
         mkdir -p _build
-        cd "$GITHUB_WORKSPACE/_build"
+        cd "_build"
         # Check if exist and use the secret named DEBUG_KEYSTORE
         # The contents of the secret can be obtained -
         #    from the debug.keystore.asc from you local _build folder
-        if [[ ! "${{ secrets.DEBUG_KEYSTORE }}" == "" ]]; then
+        if [[ ! "${{ secrets.DEBUG_KEYSTORE }}" = "" ]]; then
             echo "${{ secrets.DEBUG_KEYSTORE }}" > "debug.keystore.asc"
             if [[ -s "debug.keystore.asc" ]]; then
                 gpg -d --passphrase "debug0" --batch "debug.keystore.asc" > "debug.keystore"
-- 
cgit v1.2.3