mirror of
				https://github.com/XRPLF/rippled.git
				synced 2025-11-04 11:15:56 +00:00 
			
		
		
		
	ci: Use XRPLF/prepare-runner action (#5740)
* ci: Use XRPLF/prepare-runner action * Remove some old boost workaround
This commit is contained in:
		
							
								
								
									
										34
									
								
								.github/workflows/build-test.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										34
									
								
								.github/workflows/build-test.yml
									
									
									
									
										vendored
									
									
								
							@@ -101,6 +101,7 @@ jobs:
 | 
			
		||||
          echo 'CMake arguments: ${{ matrix.cmake_args }}'
 | 
			
		||||
          echo 'CMake target: ${{ matrix.cmake_target }}'
 | 
			
		||||
          echo 'Config name: ${{ matrix.config_name }}'
 | 
			
		||||
 | 
			
		||||
      - name: Clean workspace (MacOS)
 | 
			
		||||
        if: ${{ inputs.os == 'macos' }}
 | 
			
		||||
        run: |
 | 
			
		||||
@@ -111,18 +112,12 @@ jobs:
 | 
			
		||||
            exit 1
 | 
			
		||||
          fi
 | 
			
		||||
          find "${WORKSPACE}" -depth 1 | xargs rm -rfv
 | 
			
		||||
 | 
			
		||||
      - name: Checkout repository
 | 
			
		||||
        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
 | 
			
		||||
      - name: Set up Python (Windows)
 | 
			
		||||
        if: ${{ inputs.os == 'windows' }}
 | 
			
		||||
        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
 | 
			
		||||
        with:
 | 
			
		||||
          python-version: 3.13
 | 
			
		||||
      - name: Install build tools (Windows)
 | 
			
		||||
        if: ${{ inputs.os == 'windows' }}
 | 
			
		||||
        run: |
 | 
			
		||||
          echo 'Installing build tools.'
 | 
			
		||||
          pip install wheel conan
 | 
			
		||||
      - name: Prepare runner
 | 
			
		||||
        uses: XRPLF/actions/.github/actions/prepare-runner@638e0dc11ea230f91bd26622fb542116bb5254d5
 | 
			
		||||
 | 
			
		||||
      - name: Check configuration (Windows)
 | 
			
		||||
        if: ${{ inputs.os == 'windows' }}
 | 
			
		||||
        run: |
 | 
			
		||||
@@ -134,11 +129,6 @@ jobs:
 | 
			
		||||
 | 
			
		||||
          echo 'Checking Conan version.'
 | 
			
		||||
          conan --version
 | 
			
		||||
      - name: Install build tools (MacOS)
 | 
			
		||||
        if: ${{ inputs.os == 'macos' }}
 | 
			
		||||
        run: |
 | 
			
		||||
          echo 'Installing build tools.'
 | 
			
		||||
          brew install --quiet cmake conan ninja coreutils
 | 
			
		||||
      - name: Check configuration (Linux and MacOS)
 | 
			
		||||
        if: ${{ inputs.os == 'linux' || inputs.os == 'macos' }}
 | 
			
		||||
        run: |
 | 
			
		||||
@@ -162,18 +152,7 @@ jobs:
 | 
			
		||||
 | 
			
		||||
          echo 'Checking nproc version.'
 | 
			
		||||
          nproc --version
 | 
			
		||||
      - name: Set up Conan home directory (MacOS)
 | 
			
		||||
        if: ${{ inputs.os == 'macos' }}
 | 
			
		||||
        run: |
 | 
			
		||||
          echo 'Setting up Conan home directory.'
 | 
			
		||||
          export CONAN_HOME=${{ github.workspace }}/.conan
 | 
			
		||||
          mkdir -p ${CONAN_HOME}
 | 
			
		||||
      - name: Set up Conan home directory (Windows)
 | 
			
		||||
        if: ${{ inputs.os == 'windows' }}
 | 
			
		||||
        run: |
 | 
			
		||||
          echo 'Setting up Conan home directory.'
 | 
			
		||||
          set CONAN_HOME=${{ github.workspace }}\.conan
 | 
			
		||||
          mkdir -p %CONAN_HOME%
 | 
			
		||||
 | 
			
		||||
      - name: Set up Conan configuration
 | 
			
		||||
        run: |
 | 
			
		||||
          echo 'Installing configuration.'
 | 
			
		||||
@@ -196,6 +175,7 @@ jobs:
 | 
			
		||||
 | 
			
		||||
          echo 'Listing Conan remotes.'
 | 
			
		||||
          conan remote list
 | 
			
		||||
 | 
			
		||||
      - name: Build dependencies
 | 
			
		||||
        uses: ./.github/actions/build-deps
 | 
			
		||||
        with:
 | 
			
		||||
 
 | 
			
		||||
@@ -14,12 +14,6 @@ find_package(Boost 1.82 REQUIRED
 | 
			
		||||
 | 
			
		||||
add_library(ripple_boost INTERFACE)
 | 
			
		||||
add_library(Ripple::boost ALIAS ripple_boost)
 | 
			
		||||
if(XCODE)
 | 
			
		||||
  target_include_directories(ripple_boost BEFORE INTERFACE ${Boost_INCLUDE_DIRS})
 | 
			
		||||
  target_compile_options(ripple_boost INTERFACE --system-header-prefix="boost/")
 | 
			
		||||
else()
 | 
			
		||||
  target_include_directories(ripple_boost SYSTEM BEFORE INTERFACE ${Boost_INCLUDE_DIRS})
 | 
			
		||||
endif()
 | 
			
		||||
 | 
			
		||||
target_link_libraries(ripple_boost
 | 
			
		||||
  INTERFACE
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user