Skip to content

Commit 2d90d23

Browse files
committed
Need snappy in require graph.
1 parent 46db9f5 commit 2d90d23

File tree

2 files changed

+1
-16
lines changed

2 files changed

+1
-16
lines changed

.github/workflows/build_dependencies.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,6 @@ jobs:
9595
ref: ${{ inputs.branch }}
9696
if: ${{ inputs.testing == 'False' }}
9797

98-
# - name: Load Conan Cache
99-
# id: restore-cache
100-
# uses: eBay/sisl/.github/actions/load_conan@master
101-
# with:
102-
# testing: ${{ inputs.testing }}
103-
# key_prefix: SislDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-${{ inputs.prerelease }}
104-
10598
- name: Setup Conan
10699
uses: eBay/sisl/.github/actions/setup_conan2@dev/nublox2
107100
with:
@@ -111,16 +104,8 @@ jobs:
111104
- name: Prepare Recipes
112105
run: |
113106
./prepare_v2.sh
114-
# cached_pkgs=$(ls -1d ~/.conan/data/*/*/*/*/export 2>/dev/null | sed 's,.*data/,,' | cut -d'/' -f1,2 | paste -sd',' - -)
115-
# echo "::info:: Pre-cached: ${cached_pkgs}"
116107
if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
117108

118-
# - name: Save Conan Cache
119-
# uses: eBay/sisl/.github/actions/store_conan@master
120-
# with:
121-
# key_prefix: SislDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-${{ inputs.prerelease }}
122-
# if: ${{ github.event_name != 'pull_request' && steps.restore-cache.outputs.cache-hit != 'true' }}
123-
124109
- name: Create and Test Package
125110
run: |
126111
sanitize=$([[ "${{ inputs.tooling }}" == "Sanitize" ]] && echo "True" || echo "False")

conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def requirements(self):
9696
self.requires("flatbuffers/24.12.23", transitive_headers=True)
9797
self.requires("folly/nu2.2024.08.12.00", transitive_headers=True)
9898
self.requires("prometheus-cpp/1.3.0", transitive_headers=True)
99-
self.requires("snappy/1.2.1", override=True, transitive_headers=True)
99+
self.requires("snappy/1.2.1", transitive_headers=True)
100100
self.requires("userspace-rcu/nu2.0.14.0", transitive_headers=True)
101101
self.requires("libcurl/8.11.1", override=True)
102102
self.requires("xz_utils/5.4.5", override=True)

0 commit comments

Comments
 (0)