ruby/setup-ruby
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not remove any dev tools from PATH on Windows

Browse Source 
* This might lead to more conflicts, but the flip side of a setup action
  removing capabilities seems worse and unexpected.
* See https://github.com/ruby/setup-ruby/issues/19
This commit is contained in:
Benoit Daloze
2020-02-09 23:38:26 +01:00
parent e15ecc8aaa
commit 55dff253ca
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/index.js
Generated Vendored
+1 -4
View File
@@ -7932,9 +7932,6 @@ function setupPath(msys2, rubyPrefix) {
const originalPath = process.env['PATH'].split(';') const originalPath = process.env['PATH'].split(';')
let path = originalPath.slice() let path = originalPath.slice()
// Remove conflicting dev tools from PATH
path = path.filter(e => !e.match(/\b(Chocolatey|CMake|mingw64|OpenSSL|Strawberry)\b/))
// Remove default Ruby in PATH // Remove default Ruby in PATH
path = path.filter(e => !e.match(/\bRuby\b/)) path = path.filter(e => !e.match(/\bRuby\b/))
@@ -7946,7 +7943,7 @@ function setupPath(msys2, rubyPrefix) {
// Add the downloaded Ruby in PATH // Add the downloaded Ruby in PATH
path.unshift(`${rubyPrefix}\\bin`) path.unshift(`${rubyPrefix}\\bin`)
console.log("Entries removed from PATH to avoid conflicts with MSYS2 and Ruby:") console.log("Entries removed from PATH to avoid conflicts with Ruby:")
for (const entry of originalPath) { for (const entry of originalPath) {
if (!path.includes(entry)) { if (!path.includes(entry)) {
console.log(entry) console.log(entry)
windows.js
+1 -4
View File
@@ -65,9 +65,6 @@ export function setupPath(msys2, rubyPrefix) {
const originalPath = process.env['PATH'].split(';') const originalPath = process.env['PATH'].split(';')
let path = originalPath.slice() let path = originalPath.slice()
// Remove conflicting dev tools from PATH
path = path.filter(e => !e.match(/\b(Chocolatey|CMake|mingw64|OpenSSL|Strawberry)\b/))
// Remove default Ruby in PATH // Remove default Ruby in PATH
path = path.filter(e => !e.match(/\bRuby\b/)) path = path.filter(e => !e.match(/\bRuby\b/))
@@ -79,7 +76,7 @@ export function setupPath(msys2, rubyPrefix) {
// Add the downloaded Ruby in PATH // Add the downloaded Ruby in PATH
path.unshift(`${rubyPrefix}\\bin`) path.unshift(`${rubyPrefix}\\bin`)
console.log("Entries removed from PATH to avoid conflicts with MSYS2 and Ruby:") console.log("Entries removed from PATH to avoid conflicts with Ruby:")
for (const entry of originalPath) { for (const entry of originalPath) {
if (!path.includes(entry)) { if (!path.includes(entry)) {
console.log(entry) console.log(entry)