Skip to content

Commit 218332f

Browse files
Merge pull request #560 from ruby/dependabot/npm_and_yarn/dependencies-8882f85aa6
Bump the dependencies group across 1 directory with 10 updates
2 parents 4b115d9 + 2a2ea18 commit 218332f

File tree

12 files changed

+2167
-1147
lines changed

12 files changed

+2167
-1147
lines changed

.github/workflows/build.yml

+1
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ jobs:
134134
chmod +x ./build-exec
135135
# wait for docker exec to be ready
136136
timeout 10 bash -c 'until ./build-exec bundle config set --local without check; do sleep 1; done'
137+
- run: ./build-exec bundle config set --local without check
137138
- run: ./build-exec ./bin/setup
138139
- run: ./build-exec bundle exec rake compile
139140
- name: Pre-release configuration

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ group :check do
1414
# Use the latest version of webrick for URI change in Ruby 3.4
1515
gem "webrick", "~> 1.8.2"
1616
gem "syntax_tree", "~> 3.5"
17-
gem "steep"
17+
gem "steep", "~> 1.9" if RUBY_VERSION >= "3.1.0"
1818
end

lib/ruby_wasm/build/product/crossruby.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def feature_name(crossruby)
3232
end
3333

3434
def make_args(crossruby)
35-
make_args = []
35+
make_args = [] #: Array[String]
3636
make_args << "CC=#{@toolchain.cc}"
3737
make_args << "CXX=#{@toolchain.cc}"
3838
make_args << "LD=#{@toolchain.ld}"

lib/ruby_wasm/build/product/product.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def initialize(target, toolchain)
1111
@toolchain = toolchain
1212
end
1313
def system_triplet_args
14-
args = []
14+
args = [] #: Array[String]
1515
case @target.triple
1616
when /^wasm32-unknown-wasi/
1717
args.concat(%W[--host wasm32-wasi])
@@ -24,7 +24,7 @@ def system_triplet_args
2424
end
2525

2626
def tools_args
27-
args = []
27+
args = [] #: Array[String]
2828
args << "CC=#{@toolchain.cc}"
2929
args << "CXX=#{@toolchain.cxx}"
3030
args << "LD=#{@toolchain.ld}"

lib/ruby_wasm/build/toolchain.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def self.check_executable(command)
4545

4646
%i[cc cxx ranlib ld ar].each do |name|
4747
define_method(name) do
48-
@tools_cache ||= {}
48+
@tools_cache ||= {} #: Hash[String, String]
4949
@tools_cache[name] ||= find_tool(name)
5050
@tools_cache[name]
5151
end

lib/ruby_wasm/packager/core.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def link_gem_exts(executor, ruby_root, gem_home, module_bytes)
111111
end
112112

113113
def _link_gem_exts(executor, build, ruby_root, gem_home, module_bytes)
114-
libraries = []
114+
libraries = [] #: Array[String]
115115

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

0 commit comments

Comments
 (0)