Reply work.

2 files changed, 65 insertions, 23 deletions

diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
index ae49e86c..c09112f1 100644
--- a/.github/workflows/debug.yml
+++ b/.github/workflows/debug.yml
@@ -32,17 +32,16 @@ jobs:
       - name: Install Dependence (Linux)
         run: |
           sudo apt-get update
-          sudo apt-get -y install build-essential binutils git autoconf automake
+          sudo apt-get -y install build-essential binutils git autoconf automake gettext texinfo
           sudo apt-get -y install gcc g++
           sudo apt-get -y install libgpgme-dev gpg
         if: matrix.os == 'ubuntu-latest'
 
       - name: Install Dependence (macOS)
         run: |
-          brew install cmake git autoconf automake qt@5
+          brew install cmake git autoconf automake qt@5 gcc texinfo gettext libgpg-error libassuan gpgme
         if: matrix.os == 'macos-latest'
 
-
       - name: Cache Qt
         id: cache-qt
         uses: actions/cache@v1
@@ -69,19 +68,40 @@ jobs:
         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-qt-creator mingw-w64-x86_64-gpgme
           pacman --noconfirm -S --needed make texinfo
-
         if: matrix.os == 'windows-latest'
 
-      - name: Build GpgME
+      - name: Build gpg-error (Linux)
+        run: |
+          cd  ${{github.workspace}}/..
+          git clone https://github.com/saturneric/libgpg-error
+          cd libgpg-error
+          ./autogen.sh
+          ./configure --enable-maintainer-mode --enable-static=yes && make -j2
+          sudo make install
+          cd ${{github.workspace}}
+        if: matrix.os == 'ubuntu-latest'
+
+      - name: Build assuan (Linux)
         run: |
-          cd ..
+          cd  ${{github.workspace}}/..
+          git clone https://github.com/saturneric/libassuan
+          cd libassuan
+          ./autogen.sh
+          ./configure --enable-maintainer-mode --enable-static=yes && make -j2
+          sudo make install
+          cd ${{github.workspace}}
+        if: matrix.os == 'ubuntu-latest'
+
+      - name: Build GpgME (Linux)
+        run: |
+          cd  ${{github.workspace}}/..
           git clone https://github.com/saturneric/gpgme
           cd gpgme
           ./autogen.sh
-          ./configure && make -j2
+          ./configure --enable-maintainer-mode --enable-static=yes --enable-languages=cpp && make -j2
           sudo make install
           cd ${{github.workspace}}
-        if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
+        if: matrix.os == 'ubuntu-latest'
 
       - name: Build GpgME (Windows)
         shell: msys2 {0}
@@ -89,7 +109,7 @@ jobs:
           git clone https://github.com/saturneric/gpgme
           cd gpgme
           ./autogen.sh
-          ./configure --enable-static=true --enable-languages=cpp LDFLAGS="-static" && make -j2
+          ./configure --enable-maintainer-mode --enable-static=yes --enable-languages=cpp LDFLAGS="-static" && make -j2
           make install
         if: matrix.os == 'windows-latest'
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 553bd6d3..96535bbc 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,19 +32,18 @@ jobs:
       - name: Install Dependence (Linux)
         run: |
           sudo apt-get update
-          sudo apt-get -y install build-essential binutils git autoconf automake
+          sudo apt-get -y install build-essential binutils git autoconf automake gettext texinfo
           sudo apt-get -y install gcc g++
           sudo apt-get -y install libgpgme-dev gpg
         if: matrix.os == 'ubuntu-latest'
 
       - name: Install Dependence (macOS)
         run: |
-          brew install cmake git autoconf automake qt@5 gcc
+          brew install cmake git autoconf automake qt@5 gcc texinfo gettext libgpg-error libassuan gpgme
           brew link qt@5
           brew link gcc
         if: matrix.os == 'macos-latest'
 
-
       - name: Cache Qt
         id: cache-qt
         uses: actions/cache@v1
@@ -73,16 +72,38 @@ jobs:
           pacman --noconfirm -S --needed make texinfo
         if: matrix.os == 'windows-latest'
 
-      - name: Build GpgME
+      - name: Build gpg-error (Linux)
+        run: |
+          cd  ${{github.workspace}}/..
+          git clone https://github.com/saturneric/libgpg-error
+          cd libgpg-error
+          ./autogen.sh
+          ./configure --enable-maintainer-mode --enable-static=yes && make -j2
+          sudo make install
+          cd ${{github.workspace}}
+        if: matrix.os == 'ubuntu-latest'
+
+      - name: Build assuan (Linux)
+        run: |
+          cd  ${{github.workspace}}/..
+          git clone https://github.com/saturneric/libassuan
+          cd libassuan
+          ./autogen.sh
+          ./configure --enable-maintainer-mode --enable-static=yes && make -j2
+          sudo make install
+          cd ${{github.workspace}}
+        if: matrix.os == 'ubuntu-latest'
+
+      - name: Build GpgME (Linux)
         run: |
-          cd ..
+          cd  ${{github.workspace}}/..
           git clone https://github.com/saturneric/gpgme
           cd gpgme
           ./autogen.sh
-          ./configure --enable-maintainer-mode --enable-languages=cpp && make -j2
+          ./configure --enable-maintainer-mode --enable-static=yes --enable-languages=cpp && make -j2
           sudo make install
           cd ${{github.workspace}}
-        if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
+        if: matrix.os == 'ubuntu-latest'
 
       - name: Build GpgME (Windows)
         shell: msys2 {0}
@@ -90,7 +111,7 @@ jobs:
           git clone https://github.com/saturneric/gpgme
           cd gpgme
           ./autogen.sh
-          ./configure --enable-maintainer-mode --enable-static=true --enable-languages=cpp LDFLAGS="-static" && make -j2
+          ./configure --enable-maintainer-mode --enable-static=yes --enable-languages=cpp LDFLAGS="-static" && make -j2
           make install
         if: matrix.os == 'windows-latest'
 
@@ -103,14 +124,15 @@ jobs:
       - name: Build GpgFrontend
         # Build your program with the given configuration
         run: cmake --build ${{github.workspace}}/build --config $env.BUILD_TYPE}}  -- -j 2
-        if: matrix.os == 'ubuntu-latest'
+        if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
 
-      - name: Build GpgFrontend (macOS App Bundle)
-        # Build your program with the given configuration
+      - name: Package App Bundle (macOS)
         run: |
-          cmake --build ${{github.workspace}}/build --config $env.BUILD_TYPE}}  -- -j 3
           macdeployqt ${{github.workspace}}/build/release/GpgFrontend.app
-
+          mkdir ${{github.workspace}}/build/tmp/
+          hdiutil create ${{github.workspace}}/build/tmp/tmp.dmg -ov -volname "GpgFrontend" -fs HFS+ -srcfolder ${{github.workspace}}/build/release/
+          mkdir ${{github.workspace}}/build/artifactOut
+          hdiutil convert ${{github.workspace}}/build/tmp/tmp.dmg -format UDZO -o ${{github.workspace}}/build/artifactOut/GpgFrontend.dmg
         if: matrix.os == 'macos-latest'
 
       - name: Configure CMake & Build Binary(Windows)
@@ -138,7 +160,7 @@ jobs:
         uses: actions/upload-artifact@master
         with:
           name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{steps.vars.outputs.sha_short}}
-          path: ${{github.workspace}}/build/release/*
+          path: ${{github.workspace}}/build/artifactOut/*
         if: matrix.os == 'macos-latest'
 
       - name: Upload Artifact(Windows)