👷 Fixed CI build

AnotherFoxGuy · Feb 6, 2025 · d66d3a8 · d66d3a8
1 parent 8b3f719
commit d66d3a8
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,31 +28,44 @@ jobs:
         if: startsWith(matrix.os, 'ubuntu')
         run: |
           sudo apt-get update
-          sudo apt-get -y install ninja-build
-          curl "https://git.anotherfoxguy.com/AnotherFoxGuy/install-scripts/raw/branch/main/install-conan.sh" | sudo bash
+          sudo apt-get -y install ninja-build \
+            libsecret-1-dev \
+            qt6-base-dev \
+            qt6-webengine-dev \
+            qt6-webview-dev \
+            qtkeychain-qt6-dev \
+            qt6-5compat-dev \
+            qt6-l10n-tools
 
       - name: Enable Developer Command Prompt
         uses: ilammy/msvc-dev-cmd@v1
 
       - name: Cache conan packages
+        if: startsWith(matrix.os, 'windows')
         uses: actions/cache@v4
         with:
           key: conan-${{ runner.os }}-${{ hashFiles('conanfile.py') }}
           path: ~/.conan2/
 
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
+        if: startsWith(matrix.os, 'windows')
         with:
           cache: 'true'
-          version: 6.8.1
+          version: 6.7.3
           modules: qt5compat qtpositioning qtwebchannel qtwebengine qtwebview
           dir: "${{ github.workspace }}/qt/"
 
-      - name: Add conan remote
-        run: conan remote add ror-conan https://git.anotherfoxguy.com/api/packages/rorbot/conan -f
+      - name: Configure (Windows)
+        if: startsWith(matrix.os, 'windows')
+        run: |
+          conan remote add ror-conan https://git.anotherfoxguy.com/api/packages/rorbot/conan -f
+          cmake . -GNinja -DCMAKE_INSTALL_PREFIX=redist -DCMAKE_BUILD_TYPE=Release -Bbuild -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES="cmake/conan_provider.cmake"
 
-      - name: Configure
-        run: cmake . -GNinja -DCMAKE_INSTALL_PREFIX=redist -DCMAKE_BUILD_TYPE=Release -Bbuild -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES="cmake/conan_provider.cmake"
+      - name: Configure (Ubuntu)
+        if: startsWith(matrix.os, 'ubuntu')
+        run: |
+          cmake . -GNinja -DCMAKE_INSTALL_PREFIX=redist -DCMAKE_BUILD_TYPE=Release -Bbuild
 
       - name: Install
         run: |

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -212,9 +212,9 @@ if (WIN32)
 
     FetchContent_Declare(
             fossil
-            URL https://fossil-scm.org/home/uv/fossil-w64-2.23.zip
+            URL https://fossil-scm.org/home/uv/fossil-w64-2.25.zip
             DOWNLOAD_EXTRACT_TIMESTAMP TRUE
-            URL_MD5 043e72168635ca2a967e7c0b7967d521
+            URL_MD5 bdf562f5e0754b5e38020a11f0bb4555
     )
     FetchContent_MakeAvailable(fossil)
 

diff --git a/recipes/qtkeychain/conanfile.py b/recipes/qtkeychain/conanfile.py
@@ -24,7 +24,6 @@ def generate(self):
         tc.variables["QTKEYCHAIN_STATIC"] = self.options.static
         tc.variables["BUILD_WITH_QT6"] = "ON"
         tc.variables["BUILD_TEST_APPLICATION"] = "OFF"
-        # tc.variables["CMAKE_PREFIX_PATH"] = "E:/Qt/6.7.2/msvc2019_64"
         tc.generate()
         deps = CMakeDeps(self)
         deps.generate()