Skip to content

Commit 12829e5

Browse files
committed
Merge branch 'development'
2 parents eacbdf2 + 09fa46a commit 12829e5

19 files changed

+998
-115
lines changed

.github/workflows/CI.yml

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ concurrency:
2828
cancel-in-progress: true
2929
permissions:
3030
contents: read
31-
checks: write
3231

3332
jobs:
3433
Framework:
@@ -80,13 +79,7 @@ jobs:
8079
steps:
8180
- uses: actions/checkout@v4
8281
- name: ${{ matrix.name }}
83-
run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project GRDB.xcodeproj -scheme GRDB -destination "${{ matrix.destination }}" -resultBundlePath TestResults.xcresult OTHER_SWIFT_FLAGS='$(inherited) -D SQLITE_ENABLE_FTS5 -D SQLITE_ENABLE_PREUPDATE_HOOK' GCC_PREPROCESSOR_DEFINITIONS='$(inherited) GRDB_SQLITE_ENABLE_PREUPDATE_HOOK=1' clean test
84-
- uses: kishikawakatsumi/xcresulttool@v1
85-
with:
86-
path: TestResults.xcresult
87-
show-passed-tests: false
88-
show-code-coverage: false
89-
if: success() || failure()
82+
run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project GRDB.xcodeproj -scheme GRDB -destination "${{ matrix.destination }}" OTHER_SWIFT_FLAGS='$(inherited) -D SQLITE_ENABLE_FTS5 -D SQLITE_ENABLE_PREUPDATE_HOOK' GCC_PREPROCESSOR_DEFINITIONS='$(inherited) GRDB_SQLITE_ENABLE_PREUPDATE_HOOK=1' clean test
9083
SPM:
9184
name: SPM
9285
runs-on: ${{ matrix.runsOn }}
@@ -133,12 +126,6 @@ jobs:
133126
- uses: actions/checkout@v4
134127
- name: ${{ matrix.name }}
135128
run: make test_framework_SQLCipher3Encrypted
136-
- uses: kishikawakatsumi/xcresulttool@v1
137-
with:
138-
path: Tests/CocoaPods/SQLCipher3/TestResults_encrypted.xcresult
139-
show-passed-tests: false
140-
show-code-coverage: false
141-
if: success() || failure()
142129
SQLCipher4:
143130
name: SQLCipher4
144131
runs-on: ${{ matrix.runsOn }}
@@ -159,12 +146,6 @@ jobs:
159146
- uses: actions/checkout@v4
160147
- name: ${{ matrix.name }}
161148
run: make test_framework_SQLCipher4Encrypted
162-
- uses: kishikawakatsumi/xcresulttool@v1
163-
with:
164-
path: Tests/CocoaPods/SQLCipher4/TestResults_encrypted.xcresult
165-
show-passed-tests: false
166-
show-code-coverage: false
167-
if: success() || failure()
168149
CustomSQLite:
169150
name: CustomSQLite
170151
runs-on: ${{ matrix.runsOn }}
@@ -185,12 +166,6 @@ jobs:
185166
- uses: actions/checkout@v4
186167
- name: ${{ matrix.name }}
187168
run: make test_framework_GRDBCustomSQLiteOSX
188-
- uses: kishikawakatsumi/xcresulttool@v1
189-
with:
190-
path: TestResults.xcresult
191-
show-passed-tests: false
192-
show-code-coverage: false
193-
if: success() || failure()
194169
XCFramework:
195170
name: XCFramework
196171
runs-on: ${{ matrix.runsOn }}

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,3 @@ Tests/SPM/Packages
115115

116116
# Test products
117117
Tests/products
118-
119-
# CI
120-
*.xcresult

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
77

88
#### 6.x Releases
99

10+
- `6.24.x` Releases - [6.24.0](#6240)
1011
- `6.23.x` Releases - [6.23.0](#6230)
1112
- `6.22.x` Releases - [6.22.0](#6220)
1213
- `6.21.x` Releases - [6.21.0](#6210)
@@ -121,6 +122,12 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
121122

122123
---
123124

125+
## 6.24.0
126+
127+
Released January 6, 2024
128+
129+
- **New**: [#1466](https://github.com/groue/GRDB.swift/pull/1466) by [@barnettben](https://github.com/barnettben): Add schema name option to database introspection methods
130+
124131
## 6.23.0
125132

126133
Released December 1, 2023

Documentation/ReleaseProcess.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Release Process
66
To release a new GRDB version:
77

88
- Tests
9-
- `make test`
9+
- `make distclean test`
1010
- Build and run GRDBDemoiOS in Release configuration on a device
1111
- Archive GRDBDemoiOS
1212
- Check for performance regression with GRDBOSXPerformanceTests

GRDB.swift.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'GRDB.swift'
3-
s.version = '6.23.0'
3+
s.version = '6.24.0'
44

55
s.license = { :type => 'MIT', :file => 'LICENSE' }
66
s.summary = 'A toolkit for SQLite databases, with a focus on application development.'

0 commit comments

Comments
 (0)