Skip to content

Fix multiple build/release issues #135

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

Merged
merged 4 commits into from
Mar 26, 2023
Merged

Fix multiple build/release issues #135

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
35aa265
fix: Include RBS files in released gems
mjameswh Mar 24, 2023
cf92c57
Update Gem version number
mjameswh Mar 24, 2023
1991376
fix: Fix build failure on OSX with XCode 14+
mjameswh Mar 24, 2023
f88cee8
Fix native file name
mjameswh Mar 25, 2023
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
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ _yardoc/
/spec/reports/
/tmp/

*.gem

# Thermite artefacts
mkmf.log
lib/bridge.so
lib/temporal_sdk_ruby_bridge.*

# rspec failure tracking
.rspec_status
Expand Down
10 changes: 9 additions & 1 deletion Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
temporalio (0.1.0)
temporalio (0.1.1)
async
google-protobuf (~> 3.21.1)
rexml (~> 3.2.5)
Expand Down Expand Up @@ -31,11 +31,19 @@ GEM
fiber-local (1.0.0)
fileutils (1.7.0)
google-protobuf (3.21.12)
google-protobuf (3.21.12-x86_64-darwin)
google-protobuf (3.21.12-x86_64-linux)
googleapis-common-protos-types (1.5.0)
google-protobuf (~> 3.14)
grpc (1.52.0)
google-protobuf (~> 3.21)
googleapis-common-protos-types (~> 1.0)
grpc (1.52.0-x86_64-darwin)
google-protobuf (~> 3.21)
googleapis-common-protos-types (~> 1.0)
grpc (1.52.0-x86_64-linux)
google-protobuf (~> 3.21)
googleapis-common-protos-types (~> 1.0)
grpc-tools (1.52.0)
i18n (1.12.0)
concurrent-ruby (~> 1.0)
Expand Down
40 changes: 20 additions & 20 deletions bridge/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions bridge/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bridge"
version = "0.1.0"
name = "temporal-sdk-ruby-bridge"
version = "0.1.1"
authors = ["Anthony D <[email protected]>"]
edition = "2021"
repository = "https://github.com/temporalio/sdk-ruby"
Expand All @@ -22,7 +22,7 @@ tonic = "0.8"
url = "2.2"

[lib]
name = "bridge"
name = "temporal_sdk_ruby_bridge"
crate-type = ["dylib"]

[package.metadata.thermite]
Expand Down
2 changes: 1 addition & 1 deletion lib/temporalio/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Temporalio
VERSION = '0.1.0'.freeze
VERSION = '0.1.1'.freeze
end
10 changes: 10 additions & 0 deletions lib/thermite_patch.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,15 @@ def cargo_target_path(profile, *path_components)
target_base = ENV.fetch('CARGO_TARGET_DIR', File.join(rust_toplevel_dir, 'target'))
File.join(target_base, ENV.fetch('CARGO_BUILD_TARGET', ''), profile, *path_components)
end

def dynamic_linker_flags
@dynamic_linker_flags ||= begin
default_flags = RbConfig::CONFIG['DLDFLAGS'].strip
if target_os == 'darwin' && !default_flags.include?('-Wl,-undefined,dynamic_lookup')
default_flags += ' -Wl,-undefined,dynamic_lookup'
end
default_flags
end
end
end
end
2 changes: 2 additions & 0 deletions sig/thermite_patch.rbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ module Thermite
def target_os: -> String
def cargo_target_path: (String, *String) -> String
def rust_toplevel_dir: -> String
def dynamic_linker_flags: -> String

private

@target_arch: String?
@target_os: String?
@dynamic_linker_flags: String?
end
end
3 changes: 2 additions & 1 deletion temporalio.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ Gem::Specification.new do |spec|
spec.extensions = ['ext/Rakefile']

spec.files =
Dir['lib/**/*.*'] +
Dir['lib/**/*.rb'] +
Dir['sig/**/*.rbs'] +
Dir['bridge/**/*.*'].reject { |x| x.include?('/target/') } +
%w[ext/Rakefile temporalio.gemspec Gemfile LICENSE README.md]

Expand Down