Skip to content

Commit 67d50cb

Browse files
authored
Merge pull request #606 from sparklemotion/flavorjones-202501-fix-ci
ci: fix ruby head and alpine breaks
2 parents c2c490e + b498f53 commit 67d50cb

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -294,10 +294,10 @@ jobs:
294294
ruby: ${{ fromJSON(needs.ruby_versions.outputs.image_tag) }}
295295
include:
296296
# declare docker image for each platform
297-
- { platform: aarch64-linux-musl, docker_tag: "-alpine", bootstrap: "apk add build-base &&" }
298-
- { platform: arm-linux-musl, docker_tag: "-alpine", bootstrap: "apk add build-base &&" }
299-
- { platform: x86-linux-musl, docker_tag: "-alpine", bootstrap: "apk add build-base &&" }
300-
- { platform: x86_64-linux-musl, docker_tag: "-alpine", bootstrap: "apk add build-base &&" }
297+
- { platform: aarch64-linux-musl, docker_tag: "-alpine", bootstrap: "apk add build-base yaml-dev &&" }
298+
- { platform: arm-linux-musl, docker_tag: "-alpine", bootstrap: "apk add build-base yaml-dev &&" }
299+
- { platform: x86-linux-musl, docker_tag: "-alpine", bootstrap: "apk add build-base yaml-dev &&" }
300+
- { platform: x86_64-linux-musl, docker_tag: "-alpine", bootstrap: "apk add build-base yaml-dev &&" }
301301
# declare docker platform for each platform
302302
- { platform: aarch64-linux-gnu, docker_platform: "--platform=linux/arm64" }
303303
- { platform: aarch64-linux-musl, docker_platform: "--platform=linux/arm64" }
@@ -371,5 +371,5 @@ jobs:
371371
with:
372372
name: cruby-x86_64-linux-musl-gem
373373
path: gems
374-
- run: apk add build-base
374+
- run: apk add build-base yaml-dev
375375
- run: ./bin/test-gem-install ./gems

test/test_integration_pending.rb

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
require "helper"
22

3-
require "benchmark"
4-
53
class IntegrationPendingTestCase < SQLite3::TestCase
64
class ThreadSynchronizer
75
def initialize
@@ -103,12 +101,12 @@ def test_busy_timeout
103101
end
104102
synchronizer.wait_for_thread :ready_0
105103

106-
time = Benchmark.measure do
107-
assert_raise(SQLite3::BusyException) do
108-
@db.execute "insert into foo (b) values ( 'from 2' )"
109-
end
104+
start_time = Time.now
105+
assert_raise(SQLite3::BusyException) do
106+
@db.execute "insert into foo (b) values ( 'from 2' )"
110107
end
111-
assert_operator time.real * 1000, :>=, 1000
108+
end_time = Time.now
109+
assert_operator(end_time - start_time, :>=, 1.0)
112110

113111
synchronizer.send_to_thread :end_1
114112
synchronizer.close_main

0 commit comments

Comments
 (0)