mirror of
				https://github.com/XRPLF/clio.git
				synced 2025-11-04 11:55:51 +00:00 
			
		
		
		
	Turn on macOS runners in CI (#1185)
This commit is contained in:
		
							
								
								
									
										5
									
								
								.github/actions/prepare_runner/action.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								.github/actions/prepare_runner/action.yml
									
									
									
									
										vendored
									
									
								
							@@ -11,7 +11,10 @@ runs:
 | 
			
		||||
      if: ${{ runner.os == 'macOS' }}
 | 
			
		||||
      shell: bash
 | 
			
		||||
      run: |
 | 
			
		||||
          brew install llvm@14 pkg-config ninja bison cmake ccache jq gh
 | 
			
		||||
          brew install llvm@14 pkg-config ninja bison cmake ccache jq gh conan@1
 | 
			
		||||
          if ! command -v conan &> /dev/null; then
 | 
			
		||||
            echo "/opt/homebrew/opt/conan@1/bin" >> $GITHUB_PATH
 | 
			
		||||
          fi
 | 
			
		||||
 | 
			
		||||
    - name: Fix git permissions on Linux
 | 
			
		||||
      if: ${{ runner.os == 'Linux' }}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										12
									
								
								.github/actions/setup_conan/action.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										12
									
								
								.github/actions/setup_conan/action.yml
									
									
									
									
										vendored
									
									
								
							@@ -11,19 +11,15 @@ runs:
 | 
			
		||||
      if: ${{ runner.os == 'macOS' }}
 | 
			
		||||
      shell: bash
 | 
			
		||||
      env:
 | 
			
		||||
        CONAN_PROFILE: clio_clang_14
 | 
			
		||||
        CONAN_PROFILE: clio_apple_clang_15
 | 
			
		||||
      id: conan_setup_mac
 | 
			
		||||
      run: |
 | 
			
		||||
        echo "Creating $CONAN_PROFILE conan profile";
 | 
			
		||||
        clang_path="$(brew --prefix llvm@14)/bin/clang"
 | 
			
		||||
        clang_cxx_path="$(brew --prefix llvm@14)/bin/clang++"
 | 
			
		||||
        conan profile new $CONAN_PROFILE --detect --force
 | 
			
		||||
        conan profile update settings.compiler=clang $CONAN_PROFILE
 | 
			
		||||
        conan profile update settings.compiler.version=14 $CONAN_PROFILE
 | 
			
		||||
        conan profile update settings.compiler.libcxx=libc++ $CONAN_PROFILE
 | 
			
		||||
        conan profile update settings.compiler.cppstd=20 $CONAN_PROFILE
 | 
			
		||||
        conan profile update "conf.tools.build:compiler_executables={\"c\": \"$clang_path\", \"cpp\": \"$clang_cxx_path\"}" $CONAN_PROFILE
 | 
			
		||||
        conan profile update env.CC="$clang_path" $CONAN_PROFILE
 | 
			
		||||
        conan profile update env.CXX="$clang_cxx_path" $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
 | 
			
		||||
        echo "created_conan_profile=$CONAN_PROFILE" >> $GITHUB_OUTPUT
 | 
			
		||||
 | 
			
		||||
    - name: On linux
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										8
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							@@ -32,9 +32,9 @@ jobs:
 | 
			
		||||
              image: rippleci/clio_ci:latest
 | 
			
		||||
            build_type: Debug
 | 
			
		||||
            code_coverage: true
 | 
			
		||||
          # - os: macOS
 | 
			
		||||
          #   build_type: Release
 | 
			
		||||
          #   code_coverage: false
 | 
			
		||||
          - os: macos14
 | 
			
		||||
            build_type: Release
 | 
			
		||||
            code_coverage: false
 | 
			
		||||
    runs-on: [self-hosted, "${{ matrix.os }}"]
 | 
			
		||||
    container: ${{ matrix.container }}
 | 
			
		||||
 | 
			
		||||
@@ -142,7 +142,7 @@ jobs:
 | 
			
		||||
          - os: heavy
 | 
			
		||||
            container:
 | 
			
		||||
              image: rippleci/clio_ci:latest
 | 
			
		||||
          # - os: macOS
 | 
			
		||||
          - os: macos14
 | 
			
		||||
    runs-on: [self-hosted, "${{ matrix.os }}"]
 | 
			
		||||
    container: ${{ matrix.container }}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										8
									
								
								.github/workflows/nightly.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								.github/workflows/nightly.yml
									
									
									
									
										vendored
									
									
								
							@@ -11,8 +11,8 @@ jobs:
 | 
			
		||||
      fail-fast: false
 | 
			
		||||
      matrix:
 | 
			
		||||
        include:
 | 
			
		||||
          # - os: macOS
 | 
			
		||||
          #   build_type: Release
 | 
			
		||||
          - os: macos14
 | 
			
		||||
            build_type: Release
 | 
			
		||||
          - os: heavy
 | 
			
		||||
            build_type: Release
 | 
			
		||||
            container:
 | 
			
		||||
@@ -76,8 +76,8 @@ jobs:
 | 
			
		||||
      fail-fast: false
 | 
			
		||||
      matrix:
 | 
			
		||||
        include:
 | 
			
		||||
          # - os: macOS
 | 
			
		||||
          #   build_type: Release
 | 
			
		||||
          - os: macos14
 | 
			
		||||
            build_type: Release
 | 
			
		||||
          - os: heavy
 | 
			
		||||
            build_type: Release
 | 
			
		||||
          - os: heavy
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user