Skip to content

Commit 603f822

Browse files
authored
fix: bump rbspy to fix ruby 3.3.8, 3.4 (#215)
1 parent f851881 commit 603f822

File tree

7 files changed

+14
-14
lines changed

7 files changed

+14
-14
lines changed

.github/workflows/ci-ffi-ruby.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
matrix:
5959
PYROSCOPE_DETECT_SUBPROCESSES: [1, 0]
6060
PYROSCOPE_ONCPU: [1, 0]
61-
RUBY_VERSION: ['3.1', '3.2', '3.3']
61+
RUBY_VERSION: ['3.1', '3.2', '3.3', '3.3.8', '3.4.3']
6262
needs: ['linux-build']
6363
name: Linux Test
6464
runs-on: ubuntu-latest

Cargo.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyroscope_backends/pyroscope_rbspy/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ repository = "https://github.com/pyroscope-io/pyroscope-rs"
1414
readme = "README.md"
1515

1616
[dependencies]
17-
rbspy = { version="0.32.0" }
17+
rbspy = { version="0.33" }
1818
pyroscope = { version = "0.5.7", path = "../../", default-features = false }
1919
log = "0.4"
2020
anyhow = "1.0.56"

pyroscope_ffi/ruby/Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
pyroscope (0.5.11)
4+
pyroscope (0.5.13)
55
ffi
66

77
GEM

pyroscope_ffi/ruby/Makefile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11

22
.phony: dev
33
dev:
4-
cd ext/rbspy && cargo build
5-
cd ext/thread_id && cargo build
4+
cd ext/rbspy && cargo build --frozen --offline
5+
cd ext/thread_id && cargo build --frozen --offline
66
mkdir -p lib/rbspy/
7-
cp ./ext/rbspy/target/debug/librbspy.so lib/rbspy/rbspy.so
7+
cp ../../target/debug/librbspy.so lib/rbspy/rbspy.so
88
mkdir -p lib/thread_id/
9-
cp ./ext/thread_id/target/debug/libthread_id.so lib/thread_id/thread_id.so
9+
cp ../../target/debug/libthread_id.so lib/thread_id/thread_id.so
10+
bundle install
1011
rake x86_64_linux:gem # todo wth is it so slow
1112
for i in $$(ls -tr pkg/pyroscope-*-x86_64-linux.gem | tail -n 1); do gem install ./$$i; done;
1213

1314
.phony: clean
1415
clean:
1516
rm -rf pkg lib/thread_id/*.so lib/rbspy/*.so
16-
cd ext/rbspy && cargo clean
17-
cd ext/thread_id && cargo clean
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module Pyroscope
2-
VERSION = '0.5.12'.freeze
2+
VERSION = '0.5.13'.freeze
33
end

pyroscope_ffi/ruby/scripts/tests/test.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
Pyroscope.configure do |config|
1010
config.application_name = "#{ENV["PYROSCOPE_RUN_ID"]}"
11+
# TODO please no og cloud
1112
config.server_address = "https://ingest.pyroscope.cloud"
1213
config.auth_token = ENV["PYROSCOPE_API_TOKEN"]
1314
config.detect_subprocesses = ENV["PYROSCOPE_DETECT_SUBPROCESSES"] == "1"

0 commit comments

Comments
 (0)