aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsaturneric <[email protected]>2025-04-16 22:32:05 +0000
committersaturneric <[email protected]>2025-04-16 22:32:05 +0000
commiteae2c5f3c680aee93c875c07e89e165dae6583cb (patch)
tree98338a75e361a289b0d016dada69a351081c7595
parentchore: upgrade linux build env to ubuntu-22.04 (diff)
downloadGpgFrontend-eae2c5f3c680aee93c875c07e89e165dae6583cb.tar.gz
GpgFrontend-eae2c5f3c680aee93c875c07e89e165dae6583cb.zip
fix: solve CI build dependencies
-rw-r--r--.github/workflows/release-qt5.yml5
-rw-r--r--.github/workflows/release.yml5
-rw-r--r--.github/workflows/testing-nightly.yml5
-rw-r--r--.gitmodules2
4 files changed, 10 insertions, 7 deletions
diff --git a/.github/workflows/release-qt5.yml b/.github/workflows/release-qt5.yml
index d7544443..afc406d4 100644
--- a/.github/workflows/release-qt5.yml
+++ b/.github/workflows/release-qt5.yml
@@ -97,6 +97,7 @@ jobs:
mingw-w64-x86_64-gpgme
mingw-w64-x86_64-libarchive
mingw-w64-x86_64-gtest
+ mingw-w64-x86_64-autotools
if: runner.os == 'Windows'
- name: Install Dependence (Linux)
@@ -106,8 +107,8 @@ jobs:
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 libfuse2 libgcrypt20-dev libnss3-dev libpci-dev libpulse-dev libudev-dev libxtst-dev
+ sudo apt-get -y install libglu1-mesa-dev libfontconfig1-dev libx11-xcb-dev libxcb-image0 gyp
sudo apt-get -y install libglu1-mesa-dev libfontconfig1-dev libx11-xcb-dev libxcb-* libxkbcommon-x11-0
if: runner.os == 'Linux'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1b2ac4f9..f370a60e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -71,8 +71,8 @@ jobs:
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 libfuse2 libgcrypt20-dev libnss3-dev libpci-dev libpulse-dev libudev-dev libxtst-dev
+ sudo apt-get -y install libglu1-mesa-dev libfontconfig1-dev libx11-xcb-dev libxcb-image0 gyp
sudo apt-get -y install libglu1-mesa-dev libfontconfig1-dev libx11-xcb-dev libxcb-* libxkbcommon-x11-0
if: runner.os == 'Linux'
@@ -137,6 +137,7 @@ jobs:
mingw-w64-x86_64-gpgme
mingw-w64-x86_64-libarchive
mingw-w64-x86_64-gtest
+ mingw-w64-x86_64-autotools
if: runner.os == 'Windows'
- name: Build gpg-error (Linux)
diff --git a/.github/workflows/testing-nightly.yml b/.github/workflows/testing-nightly.yml
index 2d6933d4..a2f778ed 100644
--- a/.github/workflows/testing-nightly.yml
+++ b/.github/workflows/testing-nightly.yml
@@ -64,8 +64,8 @@ jobs:
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 libfuse2 libgcrypt20-dev libnss3-dev libpci-dev libpulse-dev libudev-dev libxtst-dev
+ sudo apt-get -y install libglu1-mesa-dev libfontconfig1-dev libx11-xcb-dev libxcb-image0 gyp
sudo apt-get -y install libglu1-mesa-dev libfontconfig1-dev libx11-xcb-dev libxcb-* libxkbcommon-x11-0
if: runner.os == 'Linux'
@@ -130,6 +130,7 @@ jobs:
mingw-w64-x86_64-gpgme
mingw-w64-x86_64-libarchive
mingw-w64-x86_64-gtest
+ mingw-w64-x86_64-autotools
if: runner.os == 'Windows'
- name: Build gpg-error (Linux)
diff --git a/.gitmodules b/.gitmodules
index feb2801f..5f6d4363 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,4 +6,4 @@
url = https://github.com/qt/qttranslations.git
[submodule "modules"]
path = modules
- url = https://git.bktus.com/GpgFrontend/GpgFrontend-Modules.git
+ url = https://git.bktus.com/GpgFrontend/Modules.git