Skip to content

Commit e0c562b

Browse files
committed
Call 7z silently since it's too verbose
1 parent 04510c6 commit e0c562b

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

dist/index.js

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

windows.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ async function symLinkToEmbeddedMSYS2() {
7272
async function setupMingw(version) {
7373
if (version.startsWith('2.2') || version.startsWith('2.3')) {
7474
core.exportVariable('SSL_CERT_FILE', certFile)
75-
await installMSYS()
75+
await installMSYS(version)
76+
7677
return msysPathEntries
7778
} else {
7879
// Remove when Actions Windows image contains MSYS2 install
@@ -85,19 +86,17 @@ async function setupMingw(version) {
8586
}
8687

8788
// Ruby 2.2 and 2.3
88-
async function installMSYS() {
89+
async function installMSYS(version) {
8990
const url = 'https://dl.bintray.com/oneclick/rubyinstaller/DevKit-mingw64-64-4.7.2-20130224-1432-sfx.exe'
90-
9191
const downloadPath = await tc.downloadTool(url)
92-
93-
await exec.exec(`7z x ${downloadPath} -o${msys}`)
92+
await exec.exec('7z', ['x', downloadPath, `-o${msys}`], { silent: true })
9493

9594
// below are set in the old devkit.rb file ?
9695
core.exportVariable('RI_DEVKIT', msys)
9796
core.exportVariable('CC' , 'gcc')
9897
core.exportVariable('CXX', 'g++')
9998
core.exportVariable('CPP', 'cpp')
100-
core.info('Installed RubyInstaller DevKit for Ruby 2.2 or 2.3')
99+
core.info(`Installed RubyInstaller DevKit for Ruby ${version}`)
101100
}
102101

103102
async function setupMSWin() {

0 commit comments

Comments
 (0)