Skip to content

Commit

Permalink
conda-build: Adaptations for folly (#1320)
Browse files Browse the repository at this point in the history
Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>
Co-authored-by: Alex Owens <alex.owens@man.com>
  • Loading branch information
jjerphan and Alex Owens committed Feb 14, 2024
1 parent fefe4c4 commit 44d9379
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_with_conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
strategy:
matrix:
include:
- os: macos-13
- os: macos-12

fail-fast: false
runs-on: ${{ matrix.os }}
Expand Down
2 changes: 1 addition & 1 deletion environment_unix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ dependencies:
# - rocksdb
# ArcticDB is currently incompatible with fmt 10
- fmt < 10
- folly
- folly==2023.09.25.00
# Vendored build dependencies (see `cpp/thirdparty` and `cpp/vcpkg.json`)
# Versions must be kept in sync
- xxhash==0.8.2
Expand Down

0 comments on commit 44d9379

Please sign in to comment.