mirror of
				https://github.com/Xahau/xahaud.git
				synced 2025-11-04 02:35:48 +00:00 
			
		
		
		
	This commit is contained in:
		
							
								
								
									
										1
									
								
								.github/actions/xahau-ga-build/action.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.github/actions/xahau-ga-build/action.yml
									
									
									
									
										vendored
									
									
								
							@@ -59,7 +59,6 @@ runs:
 | 
			
		||||
          ${{ runner.os }}-ccache-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-${{ inputs.configuration }}-${{ inputs.main_branch }}
 | 
			
		||||
          ${{ runner.os }}-ccache-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-${{ inputs.configuration }}-
 | 
			
		||||
          ${{ runner.os }}-ccache-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-
 | 
			
		||||
          ${{ runner.os }}-ccache-v${{ inputs.cache_version }}-
 | 
			
		||||
 | 
			
		||||
    - name: Configure project
 | 
			
		||||
      shell: bash
 | 
			
		||||
 
 | 
			
		||||
@@ -54,7 +54,6 @@ runs:
 | 
			
		||||
        restore-keys: |
 | 
			
		||||
          ${{ runner.os }}-conan-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-${{ hashFiles('**/conanfile.txt', '**/conanfile.py') }}-
 | 
			
		||||
          ${{ runner.os }}-conan-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-
 | 
			
		||||
          ${{ runner.os }}-conan-v${{ inputs.cache_version }}-
 | 
			
		||||
 | 
			
		||||
    - name: Export custom recipes
 | 
			
		||||
      shell: bash
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										19
									
								
								.github/workflows/xahau-ga-nix.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										19
									
								
								.github/workflows/xahau-ga-nix.yml
									
									
									
									
										vendored
									
									
								
							@@ -22,13 +22,14 @@ jobs:
 | 
			
		||||
        configuration: [Debug]
 | 
			
		||||
        include:
 | 
			
		||||
          - compiler: gcc
 | 
			
		||||
            cc: gcc-11
 | 
			
		||||
            cxx: g++-11
 | 
			
		||||
            compiler_id: gcc-11
 | 
			
		||||
            cc: gcc-13
 | 
			
		||||
            cxx: g++-13
 | 
			
		||||
            compiler_id: gcc-13
 | 
			
		||||
            compiler_version: 13
 | 
			
		||||
    env:
 | 
			
		||||
      build_dir: .build
 | 
			
		||||
      # Bump this number to invalidate all caches globally.
 | 
			
		||||
      CACHE_VERSION: 1
 | 
			
		||||
      CACHE_VERSION: 2
 | 
			
		||||
      MAIN_BRANCH_NAME: dev
 | 
			
		||||
    steps:
 | 
			
		||||
      - name: Checkout
 | 
			
		||||
@@ -58,12 +59,8 @@ jobs:
 | 
			
		||||
          conan profile update env.CXX=/usr/bin/${{ matrix.cxx }} default
 | 
			
		||||
          conan profile update conf.tools.build:compiler_executables='{"c": "/usr/bin/${{ matrix.cc }}", "cpp": "/usr/bin/${{ matrix.cxx }}"}' default
 | 
			
		||||
 | 
			
		||||
          # Set correct compiler version based on matrix.compiler
 | 
			
		||||
          if [ "${{ matrix.compiler }}" = "gcc" ]; then
 | 
			
		||||
            conan profile update settings.compiler.version=11 default
 | 
			
		||||
          elif [ "${{ matrix.compiler }}" = "clang" ]; then
 | 
			
		||||
            conan profile update settings.compiler.version=14 default
 | 
			
		||||
          fi
 | 
			
		||||
          # Set compiler version from matrix
 | 
			
		||||
          conan profile update settings.compiler.version=${{ matrix.compiler_version }} default
 | 
			
		||||
          # Display profile for verification
 | 
			
		||||
          conan profile show default
 | 
			
		||||
 | 
			
		||||
@@ -120,4 +117,4 @@ jobs:
 | 
			
		||||
          else
 | 
			
		||||
             echo "Error: rippled executable not found in ${{ env.build_dir }}"
 | 
			
		||||
             exit 1
 | 
			
		||||
          fi
 | 
			
		||||
          fi
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,4 @@
 | 
			
		||||
#include <cstdint>
 | 
			
		||||
#include <map>
 | 
			
		||||
#include <set>
 | 
			
		||||
#include <string>
 | 
			
		||||
 
 | 
			
		||||
@@ -321,7 +321,7 @@ public:
 | 
			
		||||
            HSFEE,
 | 
			
		||||
            ter(temMALFORMED));
 | 
			
		||||
 | 
			
		||||
        env(ripple::test::jtx::hook(alice, {{}}, 0),
 | 
			
		||||
        env(ripple::test::jtx::hook(alice, std::vector<Json::Value>{}, 0),
 | 
			
		||||
            M("Must have a non-empty hooks field"),
 | 
			
		||||
            HSFEE,
 | 
			
		||||
            ter(temMALFORMED));
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user