Skip to content

Commit

Permalink
Build Snapcraft packages from source and libdigidocpp
Browse files Browse the repository at this point in the history
IB-7219

Signed-off-by: Raul Metsma <[email protected]>
  • Loading branch information
metsma committed Oct 27, 2023
1 parent d6741af commit 039a27c
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 10 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,8 @@ jobs:
with:
submodules: recursive
- uses: snapcore/action-build@v1
- name: Cat logs
run: cat /home/runner/.local/state/snapcraft/log/snapcraft*.log
- name: Archive artifacts
uses: actions/upload-artifact@v3
with:
Expand Down
27 changes: 17 additions & 10 deletions snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ icon: client/images/Icon.svg
grade: devel
confinement: devmode

package-repositories:
- type: apt
components: [main]
suites: [focal, jammy]
key-id: 16A4D8047F6FD921EE24D3F9E9AB214DC6C83D68
key-server: hkp://keyserver.ubuntu.com:80
url: https://installer.id.ee/media/ubuntu
#package-repositories:
# - type: apt
# components: [main]
# suites: [focal, jammy]
# key-id: 16A4D8047F6FD921EE24D3F9E9AB214DC6C83D68
# key-server: hkp://keyserver.ubuntu.com:80
# url: https://installer.id.ee/media/ubuntu

apps:
qdigidoc4:
Expand All @@ -25,11 +25,18 @@ apps:
command: usr/bin/digidoc-tool

parts:
libdigidocpp:
plugin: cmake
source: https://github.com/open-eid/libdigidocpp.git
stage-packages: [libxalan-c112, libxerces-c3.2, libxml-security-c20]
build-packages: [g++, xxd, libxml-security-c-dev, libssl-dev, zlib1g-dev, xsdcxx]
cmake-parameters: [-DCMAKE_INSTALL_PREFIX=/usr, -DCMAKE_FIND_ROOT_PATH=/usr]
qdigidoc4:
plugin: cmake
source: .
stage-packages: [opensc-pkcs11, libdigidocpp-tools]
build-packages: [libdigidocpp-dev, libssl-dev, libpcsclite-dev, libldap2-dev, libflatbuffers-dev, zlib1g-dev]
stage-packages: [opensc-pkcs11]
build-packages: [libssl-dev, libpcsclite-dev, libldap2-dev, libflatbuffers-dev]
after: [libdigidocpp]
cmake-parameters:
- -DCMAKE_INSTALL_PREFIX=/usr
- "-DCMAKE_FIND_ROOT_PATH=/usr\\;/snap/kf5-5-110-qt-5-15-11-core22-sdk/current"
- "-DCMAKE_FIND_ROOT_PATH=/usr\\;/root/stage\\;/snap/kf5-5-110-qt-5-15-11-core22-sdk/current"

0 comments on commit 039a27c

Please sign in to comment.