🔧 Use conan_provider for running conan

RigsOfRods · Jan 7, 2025 · 59bef02 · 59bef02
1 parent 350430c
commit 59bef02
Show file tree

Hide file tree

Showing 12 changed files with 684 additions and 106 deletions.
diff --git a/.github/workflows/build-conan.yml b/.github/workflows/build-conan.yml
@@ -34,34 +34,24 @@ jobs:
           curl "https://raw.githubusercontent.com/AnotherFoxGuy/ci-scripts/main/install-conan.sh" | sudo bash
           sudo apt-get update
           sudo apt-get -y install ninja-build
+          conan profile detect --force
+          echo "tools.system.package_manager:mode = install" > ~/.conan2/global.conf
+          echo "tools.system.package_manager:sudo = True" >> ~/.conan2/global.conf
 
       - name: Install dependencies (Windows)
         if: startsWith(matrix.os, 'windows')
         shell: cmd
         run: git clone https://git.anotherfoxguy.com/AnotherFoxGuy/build-tools.git %BUILD_TOOLS_PATH%
 
-      - name: Configure (Ubuntu)
-        if: startsWith(matrix.os, 'ubuntu')
-        run: |
-          conan profile detect --force
-          echo "tools.system.package_manager:mode = install" > ~/.conan2/global.conf
-          echo "tools.system.package_manager:sudo = True" >> ~/.conan2/global.conf
-          conan remote add ror-conan https://git.anotherfoxguy.com/api/packages/rorbot/conan -f
-          conan install . -s build_type=Release -b missing -pr:b=default -c tools.cmake.cmaketoolchain:generator="Ninja"
-          cmake --preset conan-release
-        shell: bash
-
-
-      - name: Configure (Windows)
-        if: startsWith(matrix.os, 'windows')
+      - name: Configure
         run: |
           conan remote add ror-conan https://git.anotherfoxguy.com/api/packages/rorbot/conan -f
-          conan install . -b missing -pr:b=tools/conan-profiles/vs-22-release-ninja -pr=tools/conan-profiles/vs-22-release-ninja
-          cmake --preset conan-release
-        shell: cmd
+          cmake . -GNinja -DCMAKE_BUILD_TYPE=Release -Bbuild -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES="cmake/conan_provider.cmake"
 
       - name: Build
-        run: ninja
+        run: |
+          cd build
+          ninja
 
       - name: Upload bin folder
         uses: actions/upload-artifact@v4