build: Build zsign for the sake of the ios build.
Some checks failed
Build Tilde Friends / Build-All (push) Failing after 20m54s

This commit is contained in:
Cory McWilliams 2025-02-01 18:52:20 -05:00
parent 240484be4c
commit 45a09006e1
5 changed files with 13 additions and 4 deletions

View File

@ -14,7 +14,7 @@ jobs:
- /opt/keys:/opt/keys - /opt/keys:/opt/keys
- /opt/deps:/opt/deps - /opt/deps:/opt/deps
steps: steps:
- run: apt update && apt install -y doxygen git graphviz mingw-w64 libgpgme11 gcc-aarch64-linux-gnu zip unzip build-essential docker.io curl clang file - run: apt update && apt install -y doxygen git graphviz mingw-w64 libgpgme11 gcc-aarch64-linux-gnu zip unzip build-essential docker.io curl clang file cmake
- name: check out code - name: check out code
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:

3
.gitmodules vendored
View File

@ -29,3 +29,6 @@
[submodule "docs"] [submodule "docs"]
path = docs path = docs
url = https://dev.tildefriends.net/cory/tildefriends.wiki.git url = https://dev.tildefriends.net/cory/tildefriends.wiki.git
[submodule "deps/zsign"]
path = deps/zsign
url = https://github.com/zhlynn/zsign.git

View File

View File

@ -1101,12 +1101,17 @@ out/data.zip: $(RAW_FILES)
@echo [zip] $@ @echo [zip] $@
@zip -u $@ -q -9 $(RAW_FILES) @zip -u $@ -q -9 $(RAW_FILES)
out/tildefriends-%.app/tildefriends: out/%/tildefriends out/tildefriends-%.app/Info.plist out/tildefriends-%.app/tildefriends.png out/data.zip out/zsign_build/zsign: $(wildcard deps/zsign/*.cpp deps/zsign/*.h deps/zsign/*.txt deps/zsign/common/*)
@echo [cmake] $@
@cmake -B out/zsign_build deps/zsign
@cmake --build out/zsign_build
out/tildefriends-%.app/tildefriends: out/%/tildefriends out/tildefriends-%.app/Info.plist out/tildefriends-%.app/tildefriends.png out/data.zip out/zsign_build/zsign
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
@cp -v $< $@ @cp -v $(filter-out out/zsign%,$<) $@
@cp -v out/data.zip $(@D)/ @cp -v out/data.zip $(@D)/
ifeq ($(HAVE_LINUX_IOS),1) ifeq ($(HAVE_LINUX_IOS),1)
@zsign -q -k .keys/apple.p12 -f -m src/ios/embedded.mobileprovision $(realpath $(dir $@)) @out/zsign_build/zsign -q -k .keys/apple.p12 -f -m src/ios/embedded.mobileprovision $(realpath $(dir $@))
endif endif
.SECONDARY: .SECONDARY:
out/tildefriends-%.ipa: out/tildefriends-ios%.app/tildefriends out/tildefriends-%.ipa: out/tildefriends-ios%.app/tildefriends

1
deps/zsign vendored Submodule

@ -0,0 +1 @@
Subproject commit d995d539ff16f28d985f5b2a1c62dd4eb9f029ea