aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaturneric <[email protected]>2022-01-12 20:23:56 +0000
committerSaturneric <[email protected]>2022-01-12 20:52:05 +0000
commit19586c3cda1553c443df1b2efad1afc7f8452375 (patch)
treea23908412ce15d03cfa4883d5e9070840c426007
parent<refactor, chore, fix>(project, ui, core): Merged with dev/ci/2.0.5 (diff)
downloadGpgFrontend-19586c3cda1553c443df1b2efad1afc7f8452375.tar.gz
GpgFrontend-19586c3cda1553c443df1b2efad1afc7f8452375.zip
<chore>(project, ui, core): update ci for release-deb-package.yml
1. Enable the latest one-off build. 2. Fix submodule dependency problem.
-rw-r--r--.github/workflows/release-deb-package.yml38
-rw-r--r--.gitignore2
m---------third_party/easyloggingpp0
m---------third_party/json0
m---------third_party/qt-aes0
m---------third_party/smtp-mime0
6 files changed, 3 insertions, 37 deletions
diff --git a/.github/workflows/release-deb-package.yml b/.github/workflows/release-deb-package.yml
index f165b784..38f79e86 100644
--- a/.github/workflows/release-deb-package.yml
+++ b/.github/workflows/release-deb-package.yml
@@ -29,7 +29,9 @@ jobs:
- uses: actions/checkout@v2
with:
- submodules: recursive
+ submodules: 'recursive'
+
+ - run: git submodule update --init --recursive
- name: Get Short SHA of Commit
id: vars
@@ -43,40 +45,6 @@ jobs:
sudo apt-get -y install gpg
if: matrix.os == 'ubuntu-20.04'
- - name: Build gpg-error
- run: |
- cd ${{github.workspace}}/third_party/libgpg-error
- ./autogen.sh
- ./configure --enable-maintainer-mode --enable-static=yes && make -j2
- sudo make install
- cd ${{github.workspace}}
-
- - name: Build assuan
- run: |
- cd ${{github.workspace}}/third_party/libassuan
- ./autogen.sh
- ./configure --enable-maintainer-mode --enable-static=yes && make -j2
- 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
- mkdir build
- cd build
- cmake -G Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -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: Build & Package GpgFrontend (Linux DEB Package)
# Build your program with the given configuration
run: |
diff --git a/.gitignore b/.gitignore
index 2702507d..243ab625 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,6 @@
src/GpgFrontend.h
src/GpgFrontendBuildInfo.h
src/GpgFrontendBuildInstallInfo.h
-third_party/**
-!third_party/CMakeLists.txt
# gettext
*.mo
diff --git a/third_party/easyloggingpp b/third_party/easyloggingpp
new file mode 160000
+Subproject 8489989bb26c6371df103f6cbced3fbee1bc3c2
diff --git a/third_party/json b/third_party/json
new file mode 160000
+Subproject c6740d7d58a209da8960c961ee07bfb0e841e44
diff --git a/third_party/qt-aes b/third_party/qt-aes
new file mode 160000
+Subproject 845e3b4d3d3873843ca26dc365232aa1aa8ea2a
diff --git a/third_party/smtp-mime b/third_party/smtp-mime
new file mode 160000
+Subproject 3fa4a0fe5797070339422cf18b5e9ed8dcb91f9