feat: Use Conan 2 (#2179)

Merge right after: https://github.com/XRPLF/clio/pull/2178 Waits for: https://github.com/XRPLF/rippled/pull/5462
2025-11-19 11:15:50 +00:00 · 2025-06-06 19:55:46 +01:00
parent cec8b29998
commit a68229e9d7
9 changed files with 62 additions and 66 deletions
--- a/.github/actions/generate/action.yml
+++ b/.github/actions/generate/action.yml
@@ -49,7 +49,7 @@ runs:
    - name: Run conan
      shell: bash
      env:
-        BUILD_OPTION: "${{ inputs.conan_cache_hit == 'true' && 'missing' || '' }}"
+        BUILD_OPTION: "${{ inputs.conan_cache_hit == 'true' && 'missing' || '*' }}"
        CODE_COVERAGE: "${{ inputs.code_coverage == 'true' && 'True' || 'False' }}"
        STATIC_OPTION: "${{ inputs.static == 'true' && 'True' || 'False' }}"
        INTEGRATION_TESTS_OPTION: "${{ inputs.build_integration_tests == 'true' && 'True' || 'False' }}"
@@ -59,15 +59,15 @@ runs:
        conan \
          install .. \
          -of . \
-          -b $BUILD_OPTION \
-          -s build_type="${{ inputs.build_type }}" \
-          -o clio:static="${STATIC_OPTION}" \
-          -o clio:tests=True \
-          -o clio:integration_tests="${INTEGRATION_TESTS_OPTION}" \
-          -o clio:lint=False \
-          -o clio:coverage="${CODE_COVERAGE}" \
-          -o clio:time_trace="${TIME_TRACE}" \
-          --profile "${{ inputs.conan_profile }}"
+          -b "$BUILD_OPTION" \
+          -s "build_type=${{ inputs.build_type }}" \
+          -o "&:static=${STATIC_OPTION}" \
+          -o "&:tests=True" \
+          -o "&:integration_tests=${INTEGRATION_TESTS_OPTION}" \
+          -o "&:lint=False" \
+          -o "&:coverage=${CODE_COVERAGE}" \
+          -o "&:time_trace=${TIME_TRACE}" \
+          --profile:all "${{ inputs.conan_profile }}"

    - name: Run cmake
      shell: bash
--- a/.github/actions/prepare_runner/action.yml
+++ b/.github/actions/prepare_runner/action.yml
@@ -18,13 +18,13 @@ runs:
          ca-certificates \
          ccache \
          clang-build-analyzer \
-          conan@1 \
+          conan \
          gh \
          jq \
          llvm@14 \
          ninja \
          pkg-config
-        echo "/opt/homebrew/opt/conan@1/bin" >> $GITHUB_PATH
+        echo "/opt/homebrew/opt/conan@2/bin" >> $GITHUB_PATH

    - name: Install CMake 3.31.6 on mac
      if: ${{ runner.os == 'macOS' }}
@@ -55,14 +55,14 @@ runs:
      shell: bash
      run: |
        echo "CCACHE_DIR=${{ github.workspace }}/.ccache" >> $GITHUB_ENV
-        echo "CONAN_USER_HOME=${{ github.workspace }}" >> $GITHUB_ENV
+        echo "CONAN_HOME=${{ github.workspace }}/.conan2" >> $GITHUB_ENV

    - name: Set env variables for Linux
      if: ${{ runner.os == 'Linux' }}
      shell: bash
      run: |
        echo "CCACHE_DIR=/root/.ccache" >> $GITHUB_ENV
-        echo "CONAN_USER_HOME=/root/" >> $GITHUB_ENV
+        echo "CONAN_HOME=/root/.conan2" >> $GITHUB_ENV

    - name: Set CCACHE_DISABLE=1
      if: ${{ inputs.disable_ccache == 'true' }}
@@ -74,4 +74,4 @@ runs:
      shell: bash
      run: |
        mkdir -p "$CCACHE_DIR"
-        mkdir -p "$CONAN_USER_HOME/.conan"
+        mkdir -p "$CONAN_HOME"
--- a/.github/actions/restore_cache/action.yml
+++ b/.github/actions/restore_cache/action.yml
@@ -3,7 +3,7 @@ description: Find and restores conan and ccache cache

 inputs:
  conan_dir:
-    description: Path to .conan directory
+    description: Path to Conan directory
    required: true
  conan_profile:
    description: Conan profile name
@@ -41,8 +41,8 @@ runs:
      id: conan_hash
      shell: bash
      run: |
-        conan info . -j info.json -o clio:tests=True
-        packages_info="$(cat info.json | jq '.[] | "\(.display_name): \(.id)"' | grep -v 'clio')"
+        conan graph info . --format json --out-file info.json -o '&:tests=True' --profile:all ${{ inputs.conan_profile }}
+        packages_info="$(cat info.json | jq -r '.graph.nodes[]?.ref' | grep -v 'clio')"
        echo "$packages_info"
        hash="$(echo "$packages_info" | shasum -a 256 | cut -d ' ' -f 1)"
        rm info.json
@@ -52,7 +52,7 @@ runs:
      uses: actions/cache/restore@v4
      id: conan_cache
      with:
-        path: ${{ inputs.conan_dir }}/data
+        path: ${{ inputs.conan_dir }}/p
        key: clio-conan_data-${{ runner.os }}-${{ inputs.build_type }}-${{ inputs.conan_profile }}-develop-${{ steps.conan_hash.outputs.hash }}

    - name: Restore ccache cache
--- a/.github/actions/save_cache/action.yml
+++ b/.github/actions/save_cache/action.yml
@@ -42,13 +42,13 @@ runs:
      if: ${{ inputs.conan_cache_hit != 'true' }}
      shell: bash
      run: |
-        conan remove "*" -s -b -f
+        conan cache clean --source --build --temp

    - name: Save conan cache
      if: ${{ inputs.conan_cache_hit != 'true' }}
      uses: actions/cache/save@v4
      with:
-        path: ${{ inputs.conan_dir }}/data
+        path: ${{ inputs.conan_dir }}/p
        key: clio-conan_data-${{ runner.os }}-${{ inputs.build_type }}-${{ inputs.conan_profile }}-develop-${{ inputs.conan_hash }}

    - name: Save ccache cache
--- a/.github/actions/setup_conan/action.yml
+++ b/.github/actions/setup_conan/action.yml
@@ -12,22 +12,11 @@ runs:
    - name: Create conan profile on macOS
      if: ${{ runner.os == 'macOS' }}
      shell: bash
-      env:
-        CONAN_PROFILE: ${{ inputs.conan_profile }}
      run: |
-        echo "Creating \"$CONAN_PROFILE\" conan profile"
-        conan profile new "$CONAN_PROFILE" --detect --force
-        conan profile update settings.compiler.libcxx=libc++ "$CONAN_PROFILE"
-        conan profile update settings.compiler.cppstd=20 "$CONAN_PROFILE"
-        conan profile update env.CXXFLAGS=-DBOOST_ASIO_DISABLE_CONCEPTS "$CONAN_PROFILE"
-        conan profile update "conf.tools.build:cxxflags+=[\"-DBOOST_ASIO_DISABLE_CONCEPTS\"]" "$CONAN_PROFILE"
+        conan profile detect --name "${{ inputs.conan_profile }}" --force
+        sed -i '' 's/compiler.cppstd=[^ ]*/compiler.cppstd=20/' "${{ env.CONAN_HOME }}/profiles/${{ inputs.conan_profile }}"

-    - name: Add conan-non-prod artifactory
+    - name: Add artifactory remote
      shell: bash
      run: |
-        if [[ -z "$(conan remote list | grep conan-non-prod)" ]]; then
-            echo "Adding conan-non-prod"
-            conan remote add --insert 0 conan-non-prod http://18.143.149.228:8081/artifactory/api/conan/conan-non-prod
-        else
-            echo "Conan-non-prod is available"
-        fi
+        conan remote add --index 0 --force ripple http://18.143.149.228:8081/artifactory/api/conan/dev
--- a/.github/workflows/build_impl.yml
+++ b/.github/workflows/build_impl.yml
@@ -92,7 +92,7 @@ jobs:
        uses: ./.github/actions/restore_cache
        id: restore_cache
        with:
-          conan_dir: ${{ env.CONAN_USER_HOME }}/.conan
+          conan_dir: ${{ env.CONAN_HOME }}
          conan_profile: ${{ inputs.conan_profile }}
          ccache_dir: ${{ env.CCACHE_DIR }}
          build_type: ${{ inputs.build_type }}
@@ -172,7 +172,7 @@ jobs:
        if: ${{ !inputs.disable_cache && github.ref == 'refs/heads/develop' }}
        uses: ./.github/actions/save_cache
        with:
-          conan_dir: ${{ env.CONAN_USER_HOME }}/.conan
+          conan_dir: ${{ env.CONAN_HOME }}
          conan_hash: ${{ steps.restore_cache.outputs.conan_hash }}
          conan_cache_hit: ${{ steps.restore_cache.outputs.conan_cache_hit }}
          ccache_dir: ${{ env.CCACHE_DIR }}
--- a/.github/workflows/clang-tidy.yml
+++ b/.github/workflows/clang-tidy.yml
@@ -49,7 +49,7 @@ jobs:
        uses: ./.github/actions/restore_cache
        id: restore_cache
        with:
-          conan_dir: ${{ env.CONAN_USER_HOME }}/.conan
+          conan_dir: ${{ env.CONAN_HOME }}
          ccache_dir: ${{ env.CCACHE_DIR }}
          conan_profile: ${{ env.CONAN_PROFILE }}