Skip to content

Commit 7a395fc

Browse files
committed
Fix incorrect source file when not using turso
1 parent 9111df0 commit 7a395fc

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

.github/actions/setup/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ runs:
55
using: composite
66
steps:
77
- name: Setup Node.js
8-
uses: actions/setup-node@v3
8+
uses: actions/setup-node@v6
99
with:
1010
node-version-file: .nvmrc
1111

.github/workflows/ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
runs-on: ubuntu-latest
77
steps:
88
- name: Checkout
9-
uses: actions/checkout@v4
9+
uses: actions/checkout@v5
1010

1111
- name: Setup
1212
uses: ./.github/actions/setup
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: macos-latest
1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@v5
2222

2323
- name: Xcode Select
2424
run: sudo xcode-select -s /Applications/Xcode_16.4.app
@@ -60,7 +60,7 @@ jobs:
6060
runs-on: macos-latest
6161
steps:
6262
- name: Checkout
63-
uses: actions/checkout@v4
63+
uses: actions/checkout@v5
6464

6565
- name: Xcode Select
6666
run: sudo xcode-select -s /Applications/Xcode_16.4.app
@@ -102,7 +102,7 @@ jobs:
102102
runs-on: macos-latest
103103
steps:
104104
- name: Checkout
105-
uses: actions/checkout@v4
105+
uses: actions/checkout@v5
106106

107107
- name: Xcode Select
108108
run: sudo xcode-select -s /Applications/Xcode_16.4.app
@@ -144,7 +144,7 @@ jobs:
144144
runs-on: macos-latest
145145
steps:
146146
- name: Checkout
147-
uses: actions/checkout@v4
147+
uses: actions/checkout@v5
148148

149149
- name: Xcode Select
150150
run: sudo xcode-select -s /Applications/Xcode_16.4.app
@@ -203,7 +203,7 @@ jobs:
203203
# docker-images: true
204204

205205
- name: Checkout
206-
uses: actions/checkout@v4
206+
uses: actions/checkout@v5
207207

208208
- name: Turn off addons
209209
run: |
@@ -287,7 +287,7 @@ jobs:
287287
# swap-storage: true
288288
# docker-images: true
289289
- name: Checkout
290-
uses: actions/checkout@v4
290+
uses: actions/checkout@v5
291291

292292
- name: Turn on SQLCipher
293293
run: |
@@ -359,7 +359,7 @@ jobs:
359359
env:
360360
TURBO_CACHE_DIR: .turbo/android
361361
steps:
362-
- uses: actions/checkout@v4
362+
- uses: actions/checkout@v5
363363

364364
- run: node ./scripts/turnOnLibsql.js
365365

@@ -417,7 +417,7 @@ jobs:
417417
runs-on: macos-latest
418418
steps:
419419
- name: Checkout
420-
uses: actions/checkout@v4
420+
uses: actions/checkout@v5
421421

422422
- name: Xcode Select
423423
run: sudo xcode-select -s /Applications/Xcode_16.4.app
@@ -459,7 +459,7 @@ jobs:
459459
runs-on: ubuntu-latest
460460
timeout-minutes: 40
461461
steps:
462-
- uses: actions/checkout@v4
462+
- uses: actions/checkout@v5
463463

464464
- run: node ./scripts/turnOnTurso.js
465465

op-sqlite.podspec

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@ Pod::Spec.new do |s|
113113
# Base source files
114114
source_files = Dir.glob("ios/**/*.{h,hpp,m,mm}") + Dir.glob("cpp/**/*.{hpp,h,cpp,c}")
115115

116+
# Backend bridges are selected explicitly by flags and should not be compiled by default.
117+
source_files.reject! { |path| path == "cpp/turso_bridge.cpp" } unless use_turso
118+
116119
# Set the path to the `c_sources` directory based on environment
117120
if is_user_app
118121
c_sources_dir = File.join("..", "..", "..", "c_sources")

0 commit comments

Comments
 (0)