abouttreesummaryrefslogcommitdiff
path: root/.github
diff options
context:
space:
mode:
authorJules Aguillon2022-04-24 20:52:36 +0200
committerJules Aguillon2022-04-24 20:52:36 +0200
commit39952f8bdf2ee77e32152bf67df456a83e3e03fe (patch)
tree0287109a42d37cb41e55aa456382df7184b513e3 /.github
parentab4c73f9f3dda374e0ff60f2eab382612093263e (diff)
downloadunexpected-keyboard-39952f8bdf2ee77e32152bf67df456a83e3e03fe.tar.gz
unexpected-keyboard-39952f8bdf2ee77e32152bf67df456a83e3e03fe.zip
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.
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/make-apk.yml17
1 files changed, 2 insertions, 15 deletions
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"