aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/release-deb-package.yml15
1 files changed, 7 insertions, 8 deletions
diff --git a/.github/workflows/release-deb-package.yml b/.github/workflows/release-deb-package.yml
index ba4b7819..bff17c5f 100644
--- a/.github/workflows/release-deb-package.yml
+++ b/.github/workflows/release-deb-package.yml
@@ -38,7 +38,7 @@ jobs:
- name: Install Dependence (Ubuntu 20.04)
run: |
sudo apt-get update
- sudo apt-get -y install build-essential binutils git autoconf automake gettext texinfo qt5-default
+ sudo apt-get -y install build-essential binutils git autoconf automake gettext texinfo qt5-default ninja-build
sudo apt-get -y install gcc g++ libconfig++-dev libboost-all-dev
sudo apt-get -y install gpgsm libxcb-xinerama0 libxcb-icccm4-dev libcups2-dev libdrm-dev libegl1-mesa-dev
sudo apt-get -y install libgcrypt20-dev libnss3-dev libpci-dev libpulse-dev libudev-dev libxtst-dev gyp ninja-build
@@ -67,11 +67,10 @@ jobs:
cd ${{github.workspace}}/third_party/vmime
mkdir build
cd build
- cmake -DVMIME_HAVE_MESSAGING_PROTO_SENDMAIL=OFF -DVMIME_CHARSETCONV_LIB=iconv -DVMIME_TLS_SUPPORT_LIB=openssl -DVMIME_HAVE_SASL_SUPPORT=OFF ..
- make -j2
- sudo make install
+ cmake -G Ninja -DVMIME_HAVE_MESSAGING_PROTO_SENDMAIL=OFF -DVMIME_CHARSETCONV_LIB=iconv -DVMIME_TLS_SUPPORT_LIB=openssl -DVMIME_HAVE_SASL_SUPPORT=OFF ..
+ ninja -v
+ sudo ninja install
cd ${{github.workspace}}
- if: matrix.os == 'ubuntu-18.04'
- name: Build GpgME
run: |
@@ -84,10 +83,10 @@ jobs:
- name: Build & Package GpgFrontend (Linux DEB Package)
# Build your program with the given configuration
run: |
- cmake -B ${{github.workspace}}/build-deb-${{matrix.os}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_BUILD_TYPE="Release" -DGENERATE_LINUX_INSTALL_SOFTWARE=ON
- cmake --build ${{github.workspace}}/build-deb-${{matrix.os}} --config {{$env.BUILD_TYPE}} -- -j 2
+ cmake -B ${{github.workspace}}/build-deb-${{matrix.os}} -G Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_BUILD_TYPE="Release" -DGENERATE_LINUX_INSTALL_SOFTWARE=ON
+ cmake --build ${{github.workspace}}/build-deb-${{matrix.os}} --config {{$env.BUILD_TYPE}} -- -v
cd ${{github.workspace}}/build-deb-${{matrix.os}}
- make package
+ ninja package
cd ${{github.workspace}}
- name: Upload Artifact(Linux DEB)