Merge pull request #606 from sparklemotion/flavorjones-202501-fix-ci

ci: fix ruby head and alpine breaks
sparklemotion · Jan 15, 2025 · 67d50cb · 67d50cb
2 parents c2c490e + b498f53
commit 67d50cb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git 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
diff --git 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