Skip to content

Commit 8f25174

Browse files
committed
Pin C and C++ compilers to use clang
Issue #47 is likely the result of our build process mixing up clang and gcc. On macOS, let's pin the compilers to use clang as an attempt to fix it.
1 parent f447de3 commit 8f25174

3 files changed

Lines changed: 15 additions & 9 deletions

File tree

.github/workflows/CI.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
path: dist
3838

3939
macos-x86_64:
40-
runs-on: macos-14
40+
runs-on: macos-13
4141
strategy:
4242
matrix:
4343
target: [x86_64]
@@ -48,6 +48,9 @@ jobs:
4848
python-version: '3.10'
4949
- name: Build wheels
5050
uses: PyO3/maturin-action@v1
51+
env:
52+
CXX: clang++
53+
CC: clang
5154
with:
5255
target: ${{ matrix.target }}
5356
args: --release --out dist --find-interpreter
@@ -59,7 +62,7 @@ jobs:
5962
path: dist
6063

6164
macos-arm64:
62-
runs-on: macos-14-xlarge
65+
runs-on: macos-13-xlarge
6366
strategy:
6467
matrix:
6568
target: [aarch64]
@@ -70,6 +73,9 @@ jobs:
7073
with:
7174
cmake-version: '3.18.x'
7275
- uses: actions/setup-python@v4
76+
env:
77+
CXX: clang++
78+
CC: clang
7379
with:
7480
python-version: '3.10'
7581
- name: Build wheels

Cargo.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ crate-type = ["cdylib"]
99

1010
[dependencies]
1111
pyo3 = "0.19.0"
12-
libsql = { git = "https://github.com/tursodatabase/libsql/", rev = "bcf44515f6d1d9995fa15841c26a57b3483e4d31", features = ["encryption"] }
12+
libsql = { git = "https://github.com/penberg/libsql/", rev = "5a806fe53cc84a5a49853d4ae30bad64b7210c67", features = ["encryption"] }
1313
tokio = { version = "1.29.1", features = [ "rt-multi-thread" ] }
1414
tracing-subscriber = "0.3"

0 commit comments

Comments
 (0)