forked from open-eid/DigiDoc4-Client
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Version 4.4
- Loading branch information
Showing
105 changed files
with
4,769 additions
and
3,870 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,7 +10,7 @@ jobs: | |
name: Build on macOS | ||
runs-on: macos-latest | ||
env: | ||
MACOSX_DEPLOYMENT_TARGET: 10.15 | ||
MACOSX_DEPLOYMENT_TARGET: 11.0 | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v3 | ||
|
@@ -28,7 +28,7 @@ jobs: | |
env: | ||
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: YES | ||
run: | | ||
brew install ninja | ||
brew install ninja flatbuffers | ||
HASH=($(shasum prepare_osx_build_environment.sh)) | ||
curl -O -L -s https://installer.id.ee/media/github/opensc_0.22.0.pkg | ||
curl -O -L -s https://installer.id.ee/media/github/${HASH}.zip | ||
|
@@ -55,18 +55,18 @@ jobs: | |
container: ${{ matrix.container }} | ||
strategy: | ||
matrix: | ||
container: ['ubuntu:20.04', 'ubuntu:22.04', 'ubuntu:22.10'] | ||
container: ['ubuntu:20.04', 'ubuntu:22.04', 'ubuntu:23.04'] | ||
env: | ||
DEBIAN_FRONTEND: noninteractive | ||
DEBFULLNAME: github-actions | ||
DEBEMAIL: [email protected] | ||
steps: | ||
- name: Install dependencies | ||
if: matrix.container == 'ubuntu:20.04' | ||
run: apt update -qq && apt install --no-install-recommends -y git lsb-release fakeroot build-essential devscripts cdbs pkg-config cmake libldap2-dev gettext libpcsclite-dev libssl-dev libqt5svg5-dev qttools5-dev-tools qttools5-dev lintian | ||
run: apt update -qq && apt install --no-install-recommends -y git lsb-release fakeroot build-essential devscripts debhelper cdbs pkg-config cmake libldap2-dev gettext libpcsclite-dev libssl-dev libqt5svg5-dev qttools5-dev-tools qttools5-dev lintian libflatbuffers-dev zlib1g-dev | ||
- name: Install dependencies | ||
if: matrix.container != 'ubuntu:20.04' | ||
run: apt update -qq && apt install --no-install-recommends -y git lsb-release fakeroot build-essential devscripts cdbs pkg-config cmake libldap2-dev gettext libpcsclite-dev libssl-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libqt6core5compat6-dev lintian | ||
run: apt update -qq && apt install --no-install-recommends -y git lsb-release fakeroot build-essential devscripts debhelper cdbs pkg-config cmake libldap2-dev gettext libpcsclite-dev libssl-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libqt6core5compat6-dev lintian libflatbuffers-dev zlib1g-dev | ||
- name: Checkout | ||
uses: actions/checkout@v3 | ||
with: | ||
|
@@ -105,12 +105,12 @@ jobs: | |
container: ${{ matrix.container }} | ||
strategy: | ||
matrix: | ||
container: ['fedora:36', 'fedora:37'] | ||
container: ['fedora:37', 'fedora:38'] | ||
env: | ||
MAKEFLAGS: -j3 | ||
steps: | ||
- name: Install Deps | ||
run: dnf install -y git gcc-c++ cmake rpm-build gettext openssl-devel openldap-devel pcsc-lite-devel qt6-qtsvg-devel qt6-qttools-devel qt6-qt5compat-devel | ||
run: dnf install -y git gcc-c++ cmake rpm-build gettext openssl-devel openldap-devel pcsc-lite-devel qt6-qtsvg-devel qt6-qttools-devel qt6-qt5compat-devel flatbuffers-devel flatbuffers-compiler zlib-devel | ||
- name: Checkout | ||
uses: actions/checkout@v3 | ||
with: | ||
|
@@ -142,24 +142,11 @@ jobs: | |
strategy: | ||
matrix: | ||
vcver: [142, 143] | ||
arch: [x64] | ||
qtver: [6.4.2] | ||
qt: [win64_msvc2019_64] | ||
qtmodules: [qt5compat] | ||
include: | ||
- vcver: 142 | ||
image: windows-2019 | ||
toolset: 14.29 | ||
- vcver: 143 | ||
image: windows-2022 | ||
toolset: 14.34 | ||
- vcver: 141 | ||
arch: x86 | ||
qtver: 5.12.12 | ||
qt: win32_msvc2017 | ||
qtmodules: | ||
image: windows-2019 | ||
toolset: 14.16 | ||
env: | ||
VER_SUFFIX: .VS${{ matrix.vcver }} | ||
steps: | ||
|
@@ -182,28 +169,27 @@ jobs: | |
- name: Prepare vcpkg | ||
uses: lukka/run-vcpkg@v7 | ||
with: | ||
vcpkgArguments: openssl | ||
vcpkgGitCommitId: a69b65229b3956b7f45abd81671b7330114bcaad | ||
vcpkgTriplet: ${{ matrix.arch }}-windows | ||
vcpkgArguments: openssl zlib flatbuffers | ||
vcpkgGitCommitId: 9b9c2758ece1d8ac0de90589730bb5ccf45c0874 | ||
vcpkgTriplet: x64-windows | ||
- name: Install Qt | ||
uses: jurplel/install-qt-action@v3 | ||
with: | ||
version: ${{ matrix.qtver }} | ||
arch: ${{ matrix.qt }} | ||
modules: ${{ matrix.qtmodules }} | ||
version: 6.5.2 | ||
arch: win64_msvc2019_64 | ||
modules: qt5compat | ||
- name: Setup dev env | ||
uses: ilammy/msvc-dev-cmd@v1 | ||
with: | ||
arch: ${{ matrix.arch }} | ||
sdk: 10.0.17763.0 | ||
toolset: ${{ matrix.toolset }} | ||
arch: x64 | ||
sdk: 10.0.19041.0 | ||
- name: Build | ||
run: | | ||
md build/client | ||
copy ${{ env.VCPKG_ROOT }}\installed\${{ matrix.arch }}-windows\bin\*.dll build\client\ | ||
copy ${{ env.RUNVCPKG_VCPKG_ROOT }}\installed\x64-windows\bin\*.dll build\client\ | ||
cmake "-GNinja" -DCMAKE_BUILD_TYPE=RelWithDebInfo ` | ||
-DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake ` | ||
"-DLIBDIGIDOCPP_LIBRARY=libs/libdigidocpp/${{ matrix.arch }}/digidocpp.lib" ` | ||
-DCMAKE_TOOLCHAIN_FILE=${{ env.RUNVCPKG_VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake ` | ||
"-DLIBDIGIDOCPP_LIBRARY=libs/libdigidocpp/x64/digidocpp.lib" ` | ||
"-DLIBDIGIDOCPP_INCLUDE_DIR=libs/libdigidocpp/include" -B build -S . | ||
cmake --build build --target msi | ||
cmake --build build --target appx | ||
|
@@ -227,7 +213,7 @@ jobs: | |
with: | ||
submodules: recursive | ||
- name: Install dependencies | ||
run: sudo apt update -qq && sudo apt install --no-install-recommends -y cmake libldap2-dev gettext libpcsclite-dev libminizip-dev libxml-security-c-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libqt6core5compat6-dev | ||
run: sudo apt update -qq && sudo apt install --no-install-recommends -y cmake libldap2-dev gettext libpcsclite-dev libminizip-dev libxml-security-c-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libqt6core5compat6-dev libflatbuffers-dev zlib1g-dev | ||
- name: Download artifact | ||
uses: dawidd6/action-download-artifact@v2 | ||
with: | ||
|
@@ -271,7 +257,7 @@ jobs: | |
with: | ||
submodules: recursive | ||
- name: Install dependencies | ||
run: sudo apt update -qq && sudo apt install --no-install-recommends -y cmake libldap2-dev gettext libpcsclite-dev libminizip-dev libxml-security-c-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libqt6core5compat6-dev | ||
run: sudo apt update -qq && sudo apt install --no-install-recommends -y cmake libldap2-dev gettext libpcsclite-dev libminizip-dev libxml-security-c-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libqt6core5compat6-dev libflatbuffers-dev zlib1g-dev | ||
- name: Download artifact | ||
uses: dawidd6/action-download-artifact@v2 | ||
with: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.