Skip to content

Commit

Permalink
Merge pull request #560 from ruby/dependabot/npm_and_yarn/dependencie…
Browse files Browse the repository at this point in the history
…s-8882f85aa6

Bump the dependencies group across 1 directory with 10 updates
  • Loading branch information
kateinoigakukun authored Dec 18, 2024
2 parents 4b115d9 + 2a2ea18 commit 218332f
Show file tree
Hide file tree
Showing 12 changed files with 2,167 additions and 1,147 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ jobs:
chmod +x ./build-exec
# wait for docker exec to be ready
timeout 10 bash -c 'until ./build-exec bundle config set --local without check; do sleep 1; done'
- run: ./build-exec bundle config set --local without check
- run: ./build-exec ./bin/setup
- run: ./build-exec bundle exec rake compile
- name: Pre-release configuration
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ group :check do
# Use the latest version of webrick for URI change in Ruby 3.4
gem "webrick", "~> 1.8.2"
gem "syntax_tree", "~> 3.5"
gem "steep"
gem "steep", "~> 1.9" if RUBY_VERSION >= "3.1.0"
end
2 changes: 1 addition & 1 deletion lib/ruby_wasm/build/product/crossruby.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def feature_name(crossruby)
end

def make_args(crossruby)
make_args = []
make_args = [] #: Array[String]
make_args << "CC=#{@toolchain.cc}"
make_args << "CXX=#{@toolchain.cc}"
make_args << "LD=#{@toolchain.ld}"
Expand Down
4 changes: 2 additions & 2 deletions lib/ruby_wasm/build/product/product.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def initialize(target, toolchain)
@toolchain = toolchain
end
def system_triplet_args
args = []
args = [] #: Array[String]
case @target.triple
when /^wasm32-unknown-wasi/
args.concat(%W[--host wasm32-wasi])
Expand All @@ -24,7 +24,7 @@ def system_triplet_args
end

def tools_args
args = []
args = [] #: Array[String]
args << "CC=#{@toolchain.cc}"
args << "CXX=#{@toolchain.cxx}"
args << "LD=#{@toolchain.ld}"
Expand Down
2 changes: 1 addition & 1 deletion lib/ruby_wasm/build/toolchain.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def self.check_executable(command)

%i[cc cxx ranlib ld ar].each do |name|
define_method(name) do
@tools_cache ||= {}
@tools_cache ||= {} #: Hash[String, String]
@tools_cache[name] ||= find_tool(name)
@tools_cache[name]
end
Expand Down
4 changes: 2 additions & 2 deletions lib/ruby_wasm/packager/core.rb
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def link_gem_exts(executor, ruby_root, gem_home, module_bytes)
end

def _link_gem_exts(executor, build, ruby_root, gem_home, module_bytes)
libraries = []
libraries = [] #: Array[String]

# TODO: Should be computed from dyinfo of ruby binary
wasi_libc_shared_libs = [
Expand All @@ -130,7 +130,7 @@ def _link_gem_exts(executor, build, ruby_root, gem_home, module_bytes)
wasi_sdk_path = toolchain.wasi_sdk_path
libraries << File.join(wasi_sdk_path, "share/wasi-sysroot/lib/wasm32-wasi", lib)
end
dl_openable_libs = []
dl_openable_libs = [] #: Array[[string, Array[String]]]
dl_openable_libs << [File.dirname(ruby_root), Dir.glob(File.join(ruby_root, "lib", "ruby", "**", "*.so"))]
dl_openable_libs << [gem_home, Dir.glob(File.join(gem_home, "**", "*.so"))]

Expand Down
Loading

0 comments on commit 218332f

Please sign in to comment.