Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dep: update vendored sqlite to 3.48.0 #605

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

dep: update vendored sqlite to 3.48.0 #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2471f45
dep: update vendored sqlite to 3.48.0
flavorjones Jan 14, 2025
870f2a4
dep(test): remove implicit dependence on benchmark gem
flavorjones Jan 14, 2025
ce13be6
dep(doc): fixing psych installation on alpine
flavorjones Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,10 +294,10 @@ jobs:
ruby: ${{ fromJSON(needs.ruby_versions.outputs.image_tag) }}
include:
# declare docker image for each platform
- { platform: aarch64-linux-musl, docker_tag: "-alpine", bootstrap: "apk add build-base &&" }
- { platform: arm-linux-musl, docker_tag: "-alpine", bootstrap: "apk add build-base &&" }
- { platform: x86-linux-musl, docker_tag: "-alpine", bootstrap: "apk add build-base &&" }
- { platform: x86_64-linux-musl, docker_tag: "-alpine", bootstrap: "apk add build-base &&" }
- { platform: aarch64-linux-musl, docker_tag: "-alpine", bootstrap: "apk add build-base yaml-dev &&" }
- { platform: arm-linux-musl, docker_tag: "-alpine", bootstrap: "apk add build-base yaml-dev &&" }
- { platform: x86-linux-musl, docker_tag: "-alpine", bootstrap: "apk add build-base yaml-dev &&" }
- { platform: x86_64-linux-musl, docker_tag: "-alpine", bootstrap: "apk add build-base yaml-dev &&" }
# declare docker platform for each platform
- { platform: aarch64-linux-gnu, docker_platform: "--platform=linux/arm64" }
- { platform: aarch64-linux-musl, docker_platform: "--platform=linux/arm64" }
Expand Down Expand Up @@ -371,5 +371,5 @@ jobs:
with:
name: cruby-x86_64-linux-musl-gem
path: gems
- run: apk add build-base
- run: apk add build-base yaml-dev
- run: ./bin/test-gem-install ./gems
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# sqlite3-ruby Changelog

## next / unreleased

- Vendored sqlite is updated to [v3.48.0](https://sqlite.org/releaselog/3_48.0.html) @flavorjones


## 2.5.0 / 2024-12-25

### Ruby
Expand Down
14 changes: 7 additions & 7 deletions dependencies.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ sqlite3:
# checksum verified by first checking the published sha3(256) checksum against https://sqlite.org/download.html:
# 52cd4a2304b627abbabe1a438ba853d0f6edb8e2774fcb5773c7af11077afe94
#
# $ sha3sum -a 256 ports/archives/sqlite-autoconf-3470200.tar.gz
# 52cd4a2304b627abbabe1a438ba853d0f6edb8e2774fcb5773c7af11077afe94 ports/archives/sqlite-autoconf-3470200.tar.gz
# $ sha3sum -a 256 ports/archives/sqlite-autoconf-3480000.tar.gz
# 279e3dd8fc8fea6d56acb79b380440b57f8e0c02b371e3b195c993b51c2b5b0c ports/archives/sqlite-autoconf-3480000.tar.gz
#
# $ sha256sum ports/archives/sqlite-autoconf-3470200.tar.gz
# f1b2ee412c28d7472bc95ba996368d6f0cdcf00362affdadb27ed286c179540b ports/archives/sqlite-autoconf-3470200.tar.gz
version: "3.47.2"
# $ sha256sum ports/archives/sqlite-autoconf-3480000.tar.gz
# ac992f7fca3989de7ed1fe99c16363f848794c8c32a158dafd4eb927a2e02fd5 ports/archives/sqlite-autoconf-3480000.tar.gz
version: "3.48.0"
files:
- url: "https://sqlite.org/2024/sqlite-autoconf-3470200.tar.gz"
sha256: "f1b2ee412c28d7472bc95ba996368d6f0cdcf00362affdadb27ed286c179540b"
- url: "https://sqlite.org/2025/sqlite-autoconf-3480000.tar.gz"
sha256: "ac992f7fca3989de7ed1fe99c16363f848794c8c32a158dafd4eb927a2e02fd5"
12 changes: 5 additions & 7 deletions test/test_integration_pending.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
require "helper"

require "benchmark"

class IntegrationPendingTestCase < SQLite3::TestCase
class ThreadSynchronizer
def initialize
Expand Down Expand Up @@ -103,12 +101,12 @@ def test_busy_timeout
end
synchronizer.wait_for_thread :ready_0

time = Benchmark.measure do
assert_raise(SQLite3::BusyException) do
@db.execute "insert into foo (b) values ( 'from 2' )"
end
start_time = Time.now
assert_raise(SQLite3::BusyException) do
@db.execute "insert into foo (b) values ( 'from 2' )"
end
assert_operator time.real * 1000, :>=, 1000
end_time = Time.now
assert_operator(end_time - start_time, :>=, 1.0)

synchronizer.send_to_thread :end_1
synchronizer.close_main
Expand Down
Loading