mirror of
				https://github.com/Xahau/xahaud.git
				synced 2025-11-04 02:35:48 +00:00 
			
		
		
		
	fix(ci): export correct snappy version (#546)
This commit is contained in:
		@@ -59,8 +59,8 @@ runs:
 | 
			
		||||
    - name: Export custom recipes
 | 
			
		||||
      shell: bash
 | 
			
		||||
      run: |
 | 
			
		||||
        conan export external/snappy snappy/1.1.9@
 | 
			
		||||
        conan export external/soci soci/4.0.3@
 | 
			
		||||
        conan export external/snappy snappy/1.1.10@xahaud/stable
 | 
			
		||||
        conan export external/soci soci/4.0.3@xahaud/stable
 | 
			
		||||
 | 
			
		||||
    - name: Install dependencies
 | 
			
		||||
      shell: bash
 | 
			
		||||
@@ -83,4 +83,4 @@ runs:
 | 
			
		||||
        path: |
 | 
			
		||||
          ~/.conan
 | 
			
		||||
          ~/.conan2
 | 
			
		||||
        key: ${{ steps.cache-restore-conan.outputs.cache-primary-key }}
 | 
			
		||||
        key: ${{ steps.cache-restore-conan.outputs.cache-primary-key }}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								BUILD.md
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								BUILD.md
									
									
									
									
									
								
							@@ -117,14 +117,14 @@ can't build earlier Boost versions.
 | 
			
		||||
   which allows you to statically link it with GCC, if you want.
 | 
			
		||||
 | 
			
		||||
   ```
 | 
			
		||||
   conan export external/snappy snappy/1.1.9@
 | 
			
		||||
   conan export external/snappy snappy/1.1.10@xahaud/stable
 | 
			
		||||
   ```
 | 
			
		||||
 | 
			
		||||
5. Export our [Conan recipe for SOCI](./external/soci).
 | 
			
		||||
   It patches their CMake to correctly import its dependencies.
 | 
			
		||||
 | 
			
		||||
   ```
 | 
			
		||||
   conan export external/soci soci/4.0.3@
 | 
			
		||||
   conan export external/soci soci/4.0.3@xahaud/stable
 | 
			
		||||
   ```
 | 
			
		||||
 | 
			
		||||
### Build and Test
 | 
			
		||||
 
 | 
			
		||||
@@ -43,8 +43,8 @@ export LDFLAGS="-static-libstdc++"
 | 
			
		||||
git config --global --add safe.directory /io &&
 | 
			
		||||
git checkout src/ripple/protocol/impl/BuildInfo.cpp &&
 | 
			
		||||
sed -i s/\"0.0.0\"/\"$(date +%Y).$(date +%-m).$(date +%-d)-$(git rev-parse --abbrev-ref HEAD)$(if [ -n "$4" ]; then echo "+$4"; fi)\"/g src/ripple/protocol/impl/BuildInfo.cpp &&
 | 
			
		||||
conan export external/snappy snappy/1.1.10@ &&
 | 
			
		||||
conan export external/soci soci/4.0.3@ &&
 | 
			
		||||
conan export external/snappy snappy/1.1.10@xahaud/stable &&
 | 
			
		||||
conan export external/soci soci/4.0.3@xahaud/stable &&
 | 
			
		||||
cd release-build &&
 | 
			
		||||
conan install .. --output-folder . --build missing --settings build_type=$BUILD_TYPE &&
 | 
			
		||||
cmake .. -G Ninja \
 | 
			
		||||
 
 | 
			
		||||
@@ -32,8 +32,8 @@ class Xrpl(ConanFile):
 | 
			
		||||
        'nudb/2.0.8',
 | 
			
		||||
        'openssl/1.1.1u',
 | 
			
		||||
        'protobuf/3.21.9',
 | 
			
		||||
        'snappy/1.1.10',
 | 
			
		||||
        'soci/4.0.3',
 | 
			
		||||
        'snappy/1.1.10@xahaud/stable',
 | 
			
		||||
        'soci/4.0.3@xahaud/stable',
 | 
			
		||||
        'sqlite3/3.42.0',
 | 
			
		||||
        'zlib/1.2.13',
 | 
			
		||||
        'wasmedge/0.11.2',
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user