conan v2 wip

Author: kambala-decapitator

.github/workflows/rebuildDependencies.yml

@@ -14,41 +14,28 @@ jobs:
       matrix:
         include:
           - platform: mac-intel
-            os: macos-13
+            os: macos-14
             before_install: macos.sh
             conan_profile: macos-intel
-            conan_prebuilts: dependencies-mac-intel
-            conan_options: --options with_apple_system_libs=True
-          - platform: mac-arm
-            os: macos-13
-            before_install: macos.sh
-            conan_profile: macos-arm
-            conan_prebuilts: dependencies-mac-arm
-            conan_options: --options with_apple_system_libs=True
-          - platform: ios
-            os: macos-13
-            before_install: macos.sh
-            conan_profile: ios-arm64
-            conan_prebuilts: dependencies-ios
-            conan_options: --options with_apple_system_libs=True
-          - platform: mingw-x86-64
-            os: ubuntu-24.04
-            before_install: mingw.sh
-            conan_profile: mingw64-linux.jinja
-            conan_prebuilts: dependencies-mingw-x86-64
-          - platform: mingw-x86
-            os: ubuntu-24.04
-            before_install: mingw.sh
-            conan_profile: mingw32-linux.jinja
-            conan_prebuilts: dependencies-mingw-x86
+          # - platform: mac-arm
+          #   os: macos-14
+          #   before_install: macos.sh
+          #   conan_profile: macos-arm
+          # - platform: ios
+          #   os: macos-14
+          #   before_install: macos.sh
+          #   conan_profile: ios-arm64
           - platform: android-armeabi-v7a
             os: ubuntu-24.04
             conan_profile: android-32-ndk
-            conan_prebuilts: dependencies-android-armeabi-v7a
-          - platform: android-arm64-v8a
-            os: ubuntu-24.04
-            conan_profile: android-64-ndk
-            conan_prebuilts: dependencies-android-arm64-v8a
+          # - platform: android-arm64-v8a
+          #   os: ubuntu-24.04
+          #   conan_profile: android-64-ndk
+          - platform: windows-x64
+            os: windows-2022
+            # before_install: msvc.sh
+            conan_profile: msvc-x64
+            conan_options: -c tools.cmake.cmaketoolchain:generator=
     runs-on: ${{ matrix.os }}
     defaults:
       run:
@@ -57,92 +44,65 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
+      # TODO
       with:
-        repository: 'vcmi/vcmi'
-        ref: 'update_prebuilts'
+        repository: 'kambala-decapitator/vcmi'
+        ref: 'conan-v2'
 
     - uses: actions/setup-java@v4
       if: ${{ startsWith(matrix.platform, 'android') }}
       with:
         distribution: 'temurin'
-        java-version: '11'
+        java-version: '17'
 
     - name: Prepare CI
       if: "${{ matrix.before_install != '' }}"
       run: source '${{github.workspace}}/CI/before_install/${{matrix.before_install}}'
 
-    - name: Install Conan Dependencies
-      if: "${{ matrix.conan_prebuilts != '' }}"
-      run: source '${{github.workspace}}/CI/install_conan_dependencies.sh' '${{matrix.conan_prebuilts}}'
-
-    - name: Remove old binary packages (non-android)
-      if: ${{ !startsWith(matrix.platform, 'android') }}
-      run: rm -rf ~/.conan/data/*/*/_/_/package
-    
-    # TODO: fix libiconv - fails to build on android (both macos and linux host)
-    - name: Remove old binary packages (android)
-      if: ${{ startsWith(matrix.platform, 'android') }}
-      run: |
-        mv ~/.conan/data/libiconv ~/
-        rm -rf ~/.conan/data/*/*/_/_/package
-        mv ~/libiconv ~/.conan/data
-
-    # Completely remove packages that were confirmed to be rebuildable using upstream recipe/sources
-    # TODO: generate entire package from scratch instead of such cleanup
-    - name: Remove old recipes
-      run: |
-        rm -rf ~/.conan/data/boost
-        rm -rf ~/.conan/data/ffmpeg
-        rm -rf ~/.conan/data/xz_utils
-        rm -rf ~/.conan/data/sdl_mixer
-        rm -rf ~/.conan/data/sdl_image
-        rm -rf ~/.conan/data/sdl_ttf
-        rm -rf ~/.conan/data/sdl
-      
-    - name: Remove old recipes (non-apple)
-      if: ${{ matrix.platform != 'ios' && matrix.platform != 'mac-intel' && matrix.platform != 'mac-arm' }}
-      run: |
-        rm -rf ~/.conan/data/sqlite3
-
     - name: Install Conan
-      run: pipx install 'conan<2.0'
+      run: pipx install conan
+
+    # TODO:
+    # 0. install system libs recipes for Apple/Android
+    # 1. download our patches
+    # 2. build patched packages with conan create
+    # 3. build LuaJIT from PR changes with conan create
 
     - name: Generate conan profile
       run: |
-        conan profile new default --detect
+        conan profile detect
         conan install . \
-          --install-folder=conan-generated \
-          --no-imports \
+          --output-folder=conan-generated \
           --build=missing \
           --profile:build=default \
           --profile:host=CI/conan/${{ matrix.conan_profile }} \
           ${{ matrix.conan_options }}
-      env:
-        GENERATE_ONLY_BUILT_CONFIG: 1
 
     - name: Remove builds and source code
-      run: "conan remove --builds --src --force '*'"
-      
+      run: conan cache clean
+
     - name: Remove build requirements
       run: |
-        rm -rf ~/.conan/data/android-ndk
-        rm -rf ~/.conan/data/autoconf
-        rm -rf ~/.conan/data/automake
-        rm -rf ~/.conan/data/b2
-        rm -rf ~/.conan/data/cmake
-        rm -rf ~/.conan/data/gnu-config
-        rm -rf ~/.conan/data/libtool
-        rm -rf ~/.conan/data/m4
-        rm -rf ~/.conan/data/nasm
-        rm -rf ~/.conan/data/pkgconf
-        rm -rf ~/.conan/data/yasm
+        graphFile=graph.json
+        conan graph info . \
+          --format=json \
+          --build=never \
+          --out-file "$graphFile" \
+          --no-remote \
+          --filter=context
+
+        buildPackagesSelector='.graph.nodes[] | select(.context == "build") | .ref'
+        buildPackages=$(jq -r "$buildPackagesSelector" "$graphFile" | sort | uniq)
+        for p in $buildPackages ; do
+          conan remove --confirm "$p:*"
+        done
 
     - name: Create dependencies archive
-      run: "tar --create --xz --file dependencies-${{matrix.platform}}.txz -C ~/.conan data"
+      run: conan cache save --file dependencies-${{matrix.platform}}.tgz '*:*'
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v4
       with:
         name: dependencies-${{ matrix.platform }}
         compression-level: 0
-        path: 'dependencies-${{matrix.platform}}.txz'
+        path: 'dependencies-${{matrix.platform}}.tgz'

README.md

@@ -15,23 +15,8 @@ Current flow to update dependencies:
   - https://docs.conan.io/2/reference/conan_server.html (not recommended by Conan)
   - https://jfrog.com/
 
-- Switch to conan 2. Incomplete (and potentially outdated) PR can be found here: https://github.com/vcmi/vcmi/pull/1603 Will also require changing how we create final package - instead of archiving `~/.conan/data` we'll need to use `conan cache` command
-
-- Use Conan for msvc builds. Currently blocked by several issues, namely:
-  - Conan 1 does not works with latest Visual Studio 2022. We need to either use msvc 2019 or upgrade to conan 2.
-  - ffmpeg fails to find its dependencies when building with conan 1 + msvc 2019. Might be fixed in conan 2.
-  - Qt fails to build due to broken string escaping in a path (conan 1 + msvc 2019)
-
-- Rebuild SDL_mixer and try to enable support for opus and flac. Needs investigation as to why libopus / libflac fail to build
-
-- Consider removing pcx support from SDL_image
-
 - Rebuild ffmpeg with libdav1d and av1 support enabled. Needs investigation as to why dav1d fails to build on mingw and on android.
 
-- Find out why libiconv fails to rebuild on Android
-
-- Rebuild entire package from scratch using latest recipes from conan, to test current version of recipes
-
 - Run CI with full package rebuild on schedule (weekly? monthly?) to detect any regressions or breaking changes in CI or in used recipes
 
 - Automatically generate Github release with updated packages as part of CI. Should probably be done only for changes in main branch and/or for manually triggered workflows
@@ -49,4 +34,4 @@ With this approach we will be able to use following flow for new dependencies:
 
 After merging PR in vcmi/vcmi repository vcmi will use new dependencies.
 
-If vcmi/vcmi PR is discarded for one reason or another, changes in this repository will have to be discarded as well
+If vcmi/vcmi PR is discarded for one reason or another, changes in this repository will have to be discarded as well