From e2bb2a9bc6b4729a2fef135f7eb4f7b3b41e03d4 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Tue, 14 Jan 2025 12:32:25 -0500 Subject: [PATCH 1/2] dep(test): remove implicit dependence on benchmark gem Time.now is fine, and benchmark is being removed from default gems in Ruby 3.5. --- test/test_integration_pending.rb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/test/test_integration_pending.rb b/test/test_integration_pending.rb index b8933bcb..0b40a37f 100644 --- a/test/test_integration_pending.rb +++ b/test/test_integration_pending.rb @@ -1,7 +1,5 @@ require "helper" -require "benchmark" - class IntegrationPendingTestCase < SQLite3::TestCase class ThreadSynchronizer def initialize @@ -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 From b498f5311e963b3bf03a0767818cf90371685048 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Tue, 14 Jan 2025 13:06:23 -0500 Subject: [PATCH 2/2] dep(doc): fixing psych installation on alpine --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd0c6bbc..c77143bc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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" } @@ -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