Skip to content

Commit eecb8ab

Browse files
Fix tasks/ci.rake for build source aliases
1 parent 779ec3c commit eecb8ab

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

Rakefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ require "open-uri"
55
$LOAD_PATH << File.join(File.dirname(__FILE__), "lib")
66

77
require "ruby_wasm/rake_task"
8+
require "ruby_wasm/packager"
89

910
Dir.glob("tasks/**.rake").each { |f| import f }
1011

@@ -54,7 +55,8 @@ LIB_ROOT = File.dirname(__FILE__)
5455

5556
TOOLCHAINS = {}
5657
BUILDS.map { |_, target, _| target }.uniq.each do |target|
57-
toolchain = RubyWasm::Toolchain.get(target)
58+
build_dir = File.join(LIB_ROOT, "build")
59+
toolchain = RubyWasm::Toolchain.get(target, build_dir)
5860
TOOLCHAINS[toolchain.name] = toolchain
5961
end
6062

lib/ruby_wasm/packager.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def root
7676
end
7777

7878
# Retrieves the alias definitions for the Ruby sources.
79-
def build_source_aliases
79+
def self.build_source_aliases(root)
8080
patches = Dir[File.join(root, "patches", "*.patch")]
8181
sources = {
8282
"head" => {
@@ -139,7 +139,7 @@ def full_build_options
139139
options[:src]
140140
else
141141
src_name = options[:src]
142-
aliases = build_source_aliases
142+
aliases = self.class.build_source_aliases(root)
143143
aliases[src_name] || raise("Unknown Ruby source: #{src_name} (available: #{aliases.keys.join(", ")})")
144144
end
145145
options.merge(

tasks/ci.rake

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
def latest_build_sources
22
BUILD_SOURCES
3-
.filter_map do |name, src|
3+
.filter_map do |name|
4+
src = RubyWasm::Packager.build_source_aliases(LIB_ROOT)[name]
45
case src[:type]
56
when "github"
67
url = "repos/#{src[:repo]}/commits/#{src[:rev]}"
@@ -21,7 +22,8 @@ def release_note
2122
|:-------:|:------:|
2223
EOS
2324

24-
BUILD_SOURCES.each do |name, source|
25+
BUILD_SOURCES.each do |name|
26+
source = RubyWasm::Packager.build_source_aliases(LIB_ROOT)[name]
2527
case source[:type]
2628
when "github"
2729
output +=

0 commit comments

Comments
 (0)