Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
groue committed Jan 6, 2024
2 parents eacbdf2 + 09fa46a commit 12829e5
Show file tree
Hide file tree
Showing 19 changed files with 998 additions and 115 deletions.
27 changes: 1 addition & 26 deletions .github/workflows/CI.yml
Expand Up @@ -28,7 +28,6 @@ concurrency:
cancel-in-progress: true
permissions:
contents: read
checks: write

jobs:
Framework:
Expand Down Expand Up @@ -80,13 +79,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: ${{ matrix.name }}
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
- uses: kishikawakatsumi/xcresulttool@v1
with:
path: TestResults.xcresult
show-passed-tests: false
show-code-coverage: false
if: success() || failure()
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
SPM:
name: SPM
runs-on: ${{ matrix.runsOn }}
Expand Down Expand Up @@ -133,12 +126,6 @@ jobs:
- uses: actions/checkout@v4
- name: ${{ matrix.name }}
run: make test_framework_SQLCipher3Encrypted
- uses: kishikawakatsumi/xcresulttool@v1
with:
path: Tests/CocoaPods/SQLCipher3/TestResults_encrypted.xcresult
show-passed-tests: false
show-code-coverage: false
if: success() || failure()
SQLCipher4:
name: SQLCipher4
runs-on: ${{ matrix.runsOn }}
Expand All @@ -159,12 +146,6 @@ jobs:
- uses: actions/checkout@v4
- name: ${{ matrix.name }}
run: make test_framework_SQLCipher4Encrypted
- uses: kishikawakatsumi/xcresulttool@v1
with:
path: Tests/CocoaPods/SQLCipher4/TestResults_encrypted.xcresult
show-passed-tests: false
show-code-coverage: false
if: success() || failure()
CustomSQLite:
name: CustomSQLite
runs-on: ${{ matrix.runsOn }}
Expand All @@ -185,12 +166,6 @@ jobs:
- uses: actions/checkout@v4
- name: ${{ matrix.name }}
run: make test_framework_GRDBCustomSQLiteOSX
- uses: kishikawakatsumi/xcresulttool@v1
with:
path: TestResults.xcresult
show-passed-tests: false
show-code-coverage: false
if: success() || failure()
XCFramework:
name: XCFramework
runs-on: ${{ matrix.runsOn }}
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
Expand Up @@ -115,6 +115,3 @@ Tests/SPM/Packages

# Test products
Tests/products

# CI
*.xcresult
7 changes: 7 additions & 0 deletions CHANGELOG.md
Expand Up @@ -7,6 +7,7 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:

#### 6.x Releases

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

---

## 6.24.0

Released January 6, 2024

- **New**: [#1466](https://github.com/groue/GRDB.swift/pull/1466) by [@barnettben](https://github.com/barnettben): Add schema name option to database introspection methods

## 6.23.0

Released December 1, 2023
Expand Down
2 changes: 1 addition & 1 deletion Documentation/ReleaseProcess.md
Expand Up @@ -6,7 +6,7 @@ Release Process
To release a new GRDB version:

- Tests
- `make test`
- `make distclean test`
- Build and run GRDBDemoiOS in Release configuration on a device
- Archive GRDBDemoiOS
- Check for performance regression with GRDBOSXPerformanceTests
Expand Down
2 changes: 1 addition & 1 deletion GRDB.swift.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'GRDB.swift'
s.version = '6.23.0'
s.version = '6.24.0'

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

0 comments on commit 12829e5

Please sign in to comment.