<feat>(ci): adjust the ci file

1. Add ninja support for debug ci.
2. Streamlined build linux deb package dependencies.

2 files changed, 29 insertions, 21 deletions

diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
index 4871fc8b..b13bb461 100644
--- a/.github/workflows/debug.yml
+++ b/.github/workflows/debug.yml
@@ -35,8 +35,8 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get -y install build-essential binutils git autoconf automake gettext texinfo
-          sudo apt-get -y install gcc g++ libconfig++-dev libboost-all-dev
-          sudo apt-get -y install gpgsm
+          sudo apt-get -y install gcc g++ libconfig++-dev libboost-all-dev ninja-build
+          sudo apt-get -y install gpg
         if: matrix.os == 'ubuntu-latest'
 
       - name: Git Sumbodule Update
@@ -57,7 +57,7 @@ jobs:
       - name: Install Dependence (macOS)
         run: |
           brew install cmake git autoconf automake qt@5 gcc texinfo gettext libgpg-error libassuan gpgme openssl 
-          brew install boost libconfig gettext
+          brew install boost libconfig gettext ninja
           brew unlink gettext && brew link --force gettext
           brew link qt@5
           brew link gcc
@@ -88,9 +88,10 @@ jobs:
       - name: Set up Dependence (Windows)
         shell: msys2 {0}
         run: |
-          pacman --noconfirm -S --needed mingw-w64-x86_64-gcc mingw-w64-x86_64-make mingw-w64-x86_64-cmake autoconf automake mingw-w64-x86_64-gpgme
-          pacman --noconfirm -S --needed make texinfo mingw-w64-x86_64-libconfig mingw-w64-x86_64-boost mingw-w64-x86_64-gnupg gettext-devel libintl msys2-runtime-devel
-          pacman --noconfirm -S --needed mingw-w64-x86_64-qt5
+          pacman --noconfirm -S --needed mingw-w64-x86_64-gcc mingw-w64-x86_64-make mingw-w64-x86_64-cmake autoconf 
+          pacman --noconfirm -S --needed make texinfo mingw-w64-x86_64-libconfig mingw-w64-x86_64-boost automake 
+          pacman --noconfirm -S --needed mingw-w64-x86_64-qt5 libintl msys2-runtime-devel gettext-devel
+          pacman --noconfirm -S --needed mingw-w64-x86_64-gpgme mingw-w64-x86_64-ninja mingw-w64-x86_64-gnupg
         if: matrix.os == 'windows-latest'
 
       - name: Build gpg-error (Linux)
@@ -130,6 +131,16 @@ jobs:
           make install
         if: matrix.os == 'windows-latest'
 
+      - name: Build vmime
+        run: |
+          cd ${{github.workspace}}/third_party/vmime
+          mkdir build
+          cd build
+          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}}
+
       - name: Configure CMake
         # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
         # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
@@ -138,7 +149,7 @@ jobs:
 
       - name: Build GpgFrontend
         # Build your program with the given configuration
-        run: cmake --build ${{github.workspace}}/build --config $env.BUILD_TYPE}}  -- -j 2
+        run: cmake -G Ninja --build ${{github.workspace}}/build --config $env.BUILD_TYPE}}  -- -v
         if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-10.15'
 
       - name: Configure CMake & Build Binary(Windows)
@@ -146,9 +157,9 @@ jobs:
         run: |
           cd $(echo "/${{github.workspace}}"  | sed 's/\\/\//g' | sed 's/://')
           mkdir build && cd build
-          cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGPGFRONTEND_BUILD_TYPE_TEST_UI=ON ..
+          cmake -G Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGPGFRONTEND_BUILD_TYPE_TEST_UI=ON ..
           # Build your program with the given configuration
-          cmake --build . --config ${{env.BUILD_TYPE}}  -- -j 2
+          cmake --build . --config ${{env.BUILD_TYPE}}  -- -v
         if: matrix.os == 'windows-latest'
 
       - name: Get Short SHA of Commit
diff --git a/.github/workflows/release-deb-package.yml b/.github/workflows/release-deb-package.yml
index bff17c5f..d9296167 100644
--- a/.github/workflows/release-deb-package.yml
+++ b/.github/workflows/release-deb-package.yml
@@ -40,10 +40,7 @@ jobs:
           sudo apt-get update
           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
-          sudo apt-get -y install libglu1-mesa-dev libfontconfig1-dev libx11-xcb-dev libicu-dev libxcb-image0
-          sudo apt-get -y install libglu1-mesa-dev libfontconfig1-dev libx11-xcb-dev libicu-dev libxcb-*
+          sudo apt-get -y install gpg
         if: matrix.os == 'ubuntu-20.04'
 
       - name: Build gpg-error
@@ -62,6 +59,14 @@ jobs:
           sudo make install
           cd ${{github.workspace}}
 
+      - name: Build GpgME
+        run: |
+          cd  ${{github.workspace}}/third_party/gpgme
+          ./autogen.sh
+          ./configure --enable-maintainer-mode --enable-static=yes --enable-languages=cpp && make -j2
+          sudo make install
+          cd ${{github.workspace}}
+
       - name: Build vmime
         run: |
           cd ${{github.workspace}}/third_party/vmime
@@ -72,14 +77,6 @@ jobs:
           sudo ninja install
           cd ${{github.workspace}}
 
-      - name: Build GpgME
-        run: |
-          cd  ${{github.workspace}}/third_party/gpgme
-          ./autogen.sh
-          ./configure --enable-maintainer-mode --enable-static=yes --enable-languages=cpp && make -j2
-          sudo make install
-          cd ${{github.workspace}}
-
       - name: Build & Package GpgFrontend (Linux DEB Package)
         # Build your program with the given configuration
         run: |