fix: solve build issues in devops process

saturneric · Dec 1, 2024 · 3af4fcb · 3af4fcb
1 parent eeec34f
commit 3af4fcb
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 13 deletions.
diff --git a/.github/workflows/testing-nightly.yml b/.github/workflows/testing-nightly.yml
@@ -115,13 +115,9 @@ jobs:
             msys2-devel 
             base-devel 
             binutils 
-            autoconf 
-            make 
-            texinfo 
-            automake 
             zip
+            unzip
             libintl 
-            gettext-devel
             msys2-runtime-devel 
             mingw-w64-x86_64-toolchain
             mingw-w64-x86_64-gcc 
@@ -131,6 +127,7 @@ jobs:
             mingw-w64-x86_64-icu 
             mingw-w64-x86_64-ninja 
             mingw-w64-x86_64-gnupg 
+            mingw-w64-x86_64-gpgme
             mingw-w64-x86_64-libarchive
             mingw-w64-x86_64-gtest
         if: matrix.os == 'windows-2019'

diff --git a/modules b/modules
diff --git a/src/cmd.cpp b/src/cmd.cpp
@@ -35,14 +35,13 @@
 #include <qtextstream.h>
 
 #include "core/GpgCoreInit.h"
-#include "core/model/SettingsObject.h"
 #include "core/module/ModuleManager.h"
-#include "core/struct/settings_object/KeyDatabaseListSO.h"
 #include "core/utils/BuildInfoUtils.h"
 
 // GpgFrontend
 
 #include "GpgFrontendContext.h"
+#include "core/utils/GpgUtils.h"
 #include "test/GpgFrontendTest.h"
 
 namespace GpgFrontend {
@@ -80,6 +79,8 @@ auto PrintEnvInfo() -> int {
   stream << Tr("OpenSSL Version: ") << GetProjectOpenSSLVersion() << '\n';
   stream << Tr("Libarchive Version: ") << GetProjectLibarchiveVersion() << '\n';
 
+
+
   stream << '\n';
 
   stream << Tr("GnuPG: ") << '\n';
@@ -150,12 +151,9 @@ auto PrintEnvInfo() -> int {
   stream << "Key Database(s): " << '\n';
   stream << '\n';
 
-  auto key_database_list =
-      KeyDatabaseListSO(SettingsObject("key_database_list"));
-  const auto key_databases = key_database_list.key_databases;
-
   int index = 0;
-  for (const auto& key_database : key_databases) {
+  auto key_dbs = GetGpgKeyDatabaseInfos();
+  for (const auto& key_database : key_dbs) {
     stream << Tr("Key Database [") << index++ << "] " << Tr("Name: ")
            << key_database.name << " " << Tr("-> Path: ") << key_database.path
            << '\n';

diff --git a/src/core/struct/settings_object/KeyDatabaseItemSO.h b/src/core/struct/settings_object/KeyDatabaseItemSO.h
@@ -29,6 +29,7 @@
 #pragma once
 
 #include "core/model/KeyDatabaseInfo.h"
+
 namespace GpgFrontend {
 
 struct KeyDatabaseItemSO {

diff --git a/src/core/utils/BuildInfoUtils.cpp b/src/core/utils/BuildInfoUtils.cpp
@@ -29,6 +29,7 @@
 #include "BuildInfoUtils.h"
 
 #include <archive.h>
+#include <gpgme.h>
 #include <openssl/opensslv.h>
 
 #include "GpgFrontendBuildInfo.h"
@@ -59,6 +60,8 @@ auto GetProjectQtVersion() -> QString { return {qVersion()}; }
 
 auto GetProjectOpenSSLVersion() -> QString { return {OPENSSL_VERSION_TEXT}; }
 
+auto GetProjectGpgMEVersion() -> QString { return {GPGME_VERSION}; }
+
 auto GetProjectLibarchiveVersion() -> QString {
   return {ARCHIVE_VERSION_ONLY_STRING};
 }

diff --git a/src/core/utils/BuildInfoUtils.h b/src/core/utils/BuildInfoUtils.h
@@ -102,6 +102,13 @@ auto GPGFRONTEND_CORE_EXPORT GetProjectOpenSSLVersion() -> QString;
  */
 auto GPGFRONTEND_CORE_EXPORT GetProjectLibarchiveVersion() -> QString;
 
+/**
+ * @brief
+ *
+ * @return QString
+ */
+auto GPGFRONTEND_CORE_EXPORT GetProjectGpgMEVersion() -> QString;
+
 /**
  * @brief
  *