diff options
author | saturneric <[email protected]> | 2024-05-11 15:09:20 +0000 |
---|---|---|
committer | saturneric <[email protected]> | 2024-05-11 15:09:20 +0000 |
commit | aafe6cc3bfb108896a05af1434ccf754307f9984 (patch) | |
tree | b5f50b52e3d9276636cad83f74608c088c23d77f | |
parent | fix: add c++ header "optional" (diff) | |
download | GpgFrontend-aafe6cc3bfb108896a05af1434ccf754307f9984.tar.gz GpgFrontend-aafe6cc3bfb108896a05af1434ccf754307f9984.zip |
fix: downgrade to 6.5.3 on windows build and add qt5 build for linux platform
-rw-r--r-- | .github/workflows/release-qt5.yml | 74 | ||||
-rw-r--r-- | .github/workflows/release.yml | 6 |
2 files changed, 78 insertions, 2 deletions
diff --git a/.github/workflows/release-qt5.yml b/.github/workflows/release-qt5.yml index 74ffc61e..94357b62 100644 --- a/.github/workflows/release-qt5.yml +++ b/.github/workflows/release-qt5.yml @@ -23,7 +23,7 @@ jobs: build: strategy: matrix: - os: [ 'windows-2019' ] + os: [ 'ubuntu-20.04', 'windows-2019' ] runs-on: ${{ matrix.os }} continue-on-error: true steps: @@ -58,6 +58,25 @@ jobs: pacman --noconfirm -S --needed mingw-w64-x86_64-ninja mingw-w64-x86_64-gnupg mingw-w64-x86_64-libarchive if: matrix.os == 'windows-2019' + - name: Install Dependence (Linux) + 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++ ninja-build + sudo apt-get -y install 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 libgcrypt20-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 libxcb-image0 + sudo apt-get -y install libglu1-mesa-dev libfontconfig1-dev libx11-xcb-dev libxcb-* libxkbcommon-x11-0 + if: matrix.os == 'ubuntu-20.04' + + - name: Install Qt5 + uses: jurplel/install-qt-action@v3 + with: + version: '5.15.2' + cache: 'true' + if: matrix.os == 'ubuntu-20.04' + - name: Build gpg-error (Windows) shell: msys2 {0} run: | @@ -69,6 +88,16 @@ jobs: cd ${{github.workspace}} if: matrix.os == 'windows-2019' + - name: Build gpg-error (Linux) + run: | + git clone --depth 1 --branch libgpg-error-1.47 git://git.gnupg.org/libgpg-error.git ${{github.workspace}}/third_party/libgpg-error + cd ${{github.workspace}}/third_party/libgpg-error + ./autogen.sh + ./configure --enable-maintainer-mode && make -j4 + sudo make install + cd ${{github.workspace}} + if: matrix.os == 'ubuntu-20.04' + - name: Build assuan (Windows) shell: msys2 {0} run: | @@ -79,6 +108,16 @@ jobs: make install cd ${{github.workspace}} if: matrix.os == 'windows-2019' + + - name: Build assuan (Linux) + run: | + git clone --depth 1 --branch libassuan-2.5.6 git://git.gnupg.org/libassuan.git ${{github.workspace}}/third_party/libassuan + cd ${{github.workspace}}/third_party/libassuan + ./autogen.sh + ./configure --enable-maintainer-mode && make -j4 + sudo make install + cd ${{github.workspace}} + if: matrix.os == 'ubuntu-20.04' - name: Build GpgME (Windows) shell: msys2 {0} @@ -90,6 +129,16 @@ jobs: make install cd ${{github.workspace}} if: matrix.os == 'windows-2019' + + - name: Build GpgME (Linux) + run: | + git clone --depth 1 --branch gpgme-1.22.0 git://git.gnupg.org/gpgme.git ${{github.workspace}}/third_party/gpgme + cd ${{github.workspace}}/third_party/gpgme + ./autogen.sh + ./configure --enable-maintainer-mode --enable-languages=cpp && make -j4 + sudo make install + cd ${{github.workspace}} + if: matrix.os == 'ubuntu-20.04' - name: Configure CMake & Build Binary(Windows) shell: msys2 {0} @@ -101,6 +150,29 @@ jobs: cmake --build . --config ${{env.BUILD_TYPE}} -- -j 4 if: matrix.os == 'windows-2019' + - name: Build GpgFrontend (Linux) + # Build your GpgFrontend with the given configuration + run: | + cmake -B ${{github.workspace}}/build -G Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + cmake --build ${{github.workspace}}/build --config {{$env.BUILD_TYPE}} -- -v + if: matrix.os == 'ubuntu-20.04' + + - name: Package App Image (Linux) + run: | + mkdir ${{github.workspace}}/build/final-artifact + cd ${{github.workspace}}/build/final-artifact + wget -c -nv https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage + chmod u+x linuxdeployqt-continuous-x86_64.AppImage + ./linuxdeployqt-continuous-x86_64.AppImage ${{github.workspace}}/build/artifacts/AppDir/usr/share/applications/*.desktop -no-translations -extra-plugins=iconengines,platformthemes/libqgtk3.so -appimage -executable-dir=${{github.workspace}}/build/artifacts/AppDir/usr/plugins/mods/ + if: matrix.os == 'ubuntu-20.04' + + - name: Upload Artifact(Linux) + uses: actions/upload-artifact@master + with: + name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{ github.sha }} + path: ${{github.workspace}}/build/final-artifact/Gpg_Frontend*.AppImage* + if: matrix.os == 'ubuntu-20.04' + - name: Upload Artifact(Windows) uses: actions/upload-artifact@master with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ed7bd04c..73b296a3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -101,8 +101,12 @@ jobs: run: | 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 automake - pacman --noconfirm -S --needed mingw-w64-x86_64-qt6 libintl msys2-runtime-devel gettext-devel + pacman --noconfirm -S --needed libintl msys2-runtime-devel gettext-devel pacman --noconfirm -S --needed mingw-w64-x86_64-ninja mingw-w64-x86_64-gnupg mingw-w64-x86_64-libarchive + wget https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-qt6-base-6.5.3-1-any.pkg.tar.zst + wget https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-qt6-5compat-6.5.3-1-any.pkg.tar.zst + wget https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-qt6-svg-6.5.3-1-any.pkg.tar.zst + pacman --noconfirm -U *.pkg.tar.zst if: matrix.os == 'windows-2019' - name: Build gpg-error (Linux) |