Merge branch 'main' into dependabot/github_actions/actions/cache-3.2.6

kateinoigakukun · web-flow · commit 6272f0c2f8d1 · 2023-03-04T01:39:52.000-05:00
diff --git a/lib/ruby_wasm/build_system/product/wasi_vfs.rb b/lib/ruby_wasm/build_system/product/wasi_vfs.rb
@@ -65,7 +65,7 @@ def cli_download_url
       assets = [
         [/x86_64-linux/, "wasi-vfs-cli-x86_64-unknown-linux-gnu.zip"],
         [/x86_64-darwin/, "wasi-vfs-cli-x86_64-apple-darwin.zip"],
-        [/arm64-darwin/, "wasi-vfs-cli-aarch64-apple-darwin.zip"]
+        [/arm64e?-darwin/, "wasi-vfs-cli-aarch64-apple-darwin.zip"]
       ]
       asset = assets.find { |os, _| os =~ RUBY_PLATFORM }&.at(1)
       if asset.nil?
diff --git a/lib/ruby_wasm/build_system/toolchain.rb b/lib/ruby_wasm/build_system/toolchain.rb
@@ -127,7 +127,7 @@ def binaryen_download_url(version)
           "binaryen-version_#{@binaryen_version}-x86_64-macos.tar.gz"
         ],
         [
-          /arm64-darwin/,
+          /arm64e?-darwin/,
           "binaryen-version_#{@binaryen_version}-arm64-macos.tar.gz"
         ]
       ]
diff --git a/packages/npm-packages/ruby-wasm-wasi/package-lock.json b/packages/npm-packages/ruby-wasm-wasi/package-lock.json

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ def cli_download_url`
`65`	`65`	`assets = [`
`66`	`66`	`[/x86_64-linux/, "wasi-vfs-cli-x86_64-unknown-linux-gnu.zip"],`
`67`	`67`	`[/x86_64-darwin/, "wasi-vfs-cli-x86_64-apple-darwin.zip"],`
`68`		`- [/arm64-darwin/, "wasi-vfs-cli-aarch64-apple-darwin.zip"]`
	`68`	`+ [/arm64e?-darwin/, "wasi-vfs-cli-aarch64-apple-darwin.zip"]`
`69`	`69`	`]`
`70`	`70`	`asset = assets.find { \|os, _\| os =~ RUBY_PLATFORM }&.at(1)`
`71`	`71`	`if asset.nil?`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ def binaryen_download_url(version)`
`127`	`127`	`"binaryen-version_#{@binaryen_version}-x86_64-macos.tar.gz"`
`128`	`128`	`],`
`129`	`129`	`[`
`130`		`- /arm64-darwin/,`
	`130`	`+ /arm64e?-darwin/,`
`131`	`131`	`"binaryen-version_#{@binaryen_version}-arm64-macos.tar.gz"`
`132`	`132`	`]`
`133`	`133`	`]`