aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaturneric <[email protected]>2022-07-22 19:03:47 +0000
committerSaturneric <[email protected]>2022-07-22 19:43:40 +0000
commit57827d3fb2206cb13500e8538ffd8d38642e3b20 (patch)
tree2820b5f0878ab63d7794fe21cc2477039eeaeac1
parentfix(ui): fix signer picker and other issues (diff)
downloadGpgFrontend-57827d3fb2206cb13500e8538ffd8d38642e3b20.tar.gz
GpgFrontend-57827d3fb2206cb13500e8538ffd8d38642e3b20.zip
feat(ci): add ubuntu 22.04 and 18.04 support for deb package
-rw-r--r--.github/workflows/debug.yml3
-rw-r--r--.github/workflows/release-deb-package.yml32
-rw-r--r--.github/workflows/release.yml3
-rw-r--r--CMakeLists.txt2
4 files changed, 33 insertions, 7 deletions
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
index 0615b530..05add7a5 100644
--- a/.github/workflows/debug.yml
+++ b/.github/workflows/debug.yml
@@ -23,8 +23,9 @@ jobs:
build:
strategy:
matrix:
- os: [ 'ubuntu-latest', 'macos-10.15', 'windows-latest' ]
+ os: [ 'ubuntu-latest', 'macos-10.15', 'macos-11', 'macos-12', 'windows-latest' ]
runs-on: ${{ matrix.os }}
+ continue-on-error: true
steps:
- name: Set git to use LF(Windows) or CRLF(MacOS) line endings
diff --git a/.github/workflows/release-deb-package.yml b/.github/workflows/release-deb-package.yml
index 454a579f..f2ca0747 100644
--- a/.github/workflows/release-deb-package.yml
+++ b/.github/workflows/release-deb-package.yml
@@ -23,8 +23,9 @@ jobs:
build:
strategy:
matrix:
- os: [ 'ubuntu-20.04' ]
+ os: [ 'ubuntu-20.04', 'ubuntu-22.04', 'ubuntu-18.04' ]
runs-on: ${{ matrix.os }}
+ continue-on-error: true
steps:
- uses: actions/checkout@v2
@@ -35,6 +36,22 @@ jobs:
id: vars
run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+ - name: Install Dependence (Ubuntu 18.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 gcc-8 g++-8 ninja-build
+ sudo apt-get -y install libconfig++-dev libboost-all-dev libarchive-dev libssl-dev
+ sudo apt-get -y install gpgsm libxcb-xinerama0 libxcb-icccm4-dev libcups2-dev libdrm-dev libegl1-mesa-dev
+ sudo apt-get -y install libgcrypt11-dev libnss3-dev libpci-dev libpulse-dev libudev-dev libxtst-dev gyp
+ 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 update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 8
+ sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 8
+ sudo update-alternatives --set gcc "/usr/bin/gcc-8"
+ sudo update-alternatives --set g++ "/usr/bin/g++-8"
+ if: matrix.os == 'ubuntu-18.04'
+
- name: Install Dependence (Ubuntu 20.04)
run: |
sudo apt-get update
@@ -44,6 +61,16 @@ jobs:
sudo apt-get -y install gpg
if: matrix.os == 'ubuntu-20.04'
+ - name: Install Dependence (Ubuntu 22.04)
+ run: |
+ sudo apt-get update
+ sudo apt-get -y install build-essential binutils git autoconf automake gettext texinfo
+ sudo apt-get install qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools
+ sudo apt-get -y install gcc g++ ninja-build
+ sudo apt-get -y install libarchive-dev libconfig++-dev libboost-all-dev libssl-dev
+ sudo apt-get -y install gpg
+ if: matrix.os == 'ubuntu-22.04'
+
- name: Build gpg-error (Linux)
run: |
cd ${{github.workspace}}/third_party/libgpg-error
@@ -51,7 +78,6 @@ jobs:
./configure --enable-maintainer-mode --enable-static=yes && make -j2
sudo make install
cd ${{github.workspace}}
- if: matrix.os == 'ubuntu-20.04'
- name: Build assuan (Linux)
run: |
@@ -60,7 +86,6 @@ jobs:
./configure --enable-maintainer-mode && make -j2
sudo make install
cd ${{github.workspace}}
- if: matrix.os == 'ubuntu-20.04'
- name: Build GpgME (Linux)
run: |
@@ -69,7 +94,6 @@ jobs:
./configure --enable-maintainer-mode --enable-languages=cpp && make -j2
sudo make install
cd ${{github.workspace}}
- if: matrix.os == 'ubuntu-20.04'
- name: Build & Package GpgFrontend (Linux DEB Package)
# Build your program with the given configuration
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3ec10770..15e5b298 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,8 +23,9 @@ jobs:
build:
strategy:
matrix:
- os: [ 'ubuntu-18.04', 'macos-10.15', 'windows-2019' ]
+ os: [ 'ubuntu-18.04', 'macos-10.15', 'macos-11', 'macos-12', 'windows-2019' ]
runs-on: ${{ matrix.os }}
+ continue-on-error: true
steps:
- name: Set git to use LF(Windows) or CRLF(MacOS) line endings
run: |
diff --git a/CMakeLists.txt b/CMakeLists.txt
index eecb01b0..aaf00e4e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -433,7 +433,7 @@ find_package(OpenSSL REQUIRED)
# Introduce Qt
if (QT5_ENV_SUPPORT)
# Support Qt version Both 5.12.x and 5.15.x
- find_package(Qt5 5.12 COMPONENTS Core Test Widgets PrintSupport Network REQUIRED)
+ find_package(Qt5 5.9 COMPONENTS Core Test Widgets PrintSupport Network REQUIRED)
# Qt configuration
set(CMAKE_AUTOMOC ON)