mirror of
https://github.com/ruby/setup-ruby.git
synced 2026-09-14 06:54:20 +02:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6ca151fd1b | ||
|
|
74138471e3 | ||
|
|
b3cff1b264 |
@@ -281,7 +281,7 @@ export function getOSNameVersionArch() {
|
|||||||
|
|
||||||
function findWindowsVersion() {
|
function findWindowsVersion() {
|
||||||
const version = os.version()
|
const version = os.version()
|
||||||
const match = version.match(/^Windows(?: Server)? (\d+) (?:Datacenter|Enterprise)/)
|
const match = version.match(/^Windows(?: Server)? (\d+) (?:Standard|Datacenter|Enterprise)/)
|
||||||
if (match) {
|
if (match) {
|
||||||
return match[1]
|
return match[1]
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
+3
-3
@@ -614,7 +614,7 @@ function getOSNameVersionArch() {
|
|||||||
|
|
||||||
function findWindowsVersion() {
|
function findWindowsVersion() {
|
||||||
const version = os.version()
|
const version = os.version()
|
||||||
const match = version.match(/^Windows(?: Server)? (\d+) (?:Datacenter|Enterprise)/)
|
const match = version.match(/^Windows(?: Server)? (\d+) (?:Standard|Datacenter|Enterprise)/)
|
||||||
if (match) {
|
if (match) {
|
||||||
return match[1]
|
return match[1]
|
||||||
} else {
|
} else {
|
||||||
@@ -92706,8 +92706,8 @@ function envPreInstall() {
|
|||||||
if (windows) {
|
if (windows) {
|
||||||
// puts normal Ruby temp folder on SSD
|
// puts normal Ruby temp folder on SSD
|
||||||
core.exportVariable('TMPDIR', ENV['RUNNER_TEMP'])
|
core.exportVariable('TMPDIR', ENV['RUNNER_TEMP'])
|
||||||
// bash - sets home to match native windows, normally C:\Users\<user name>
|
// bash - sets home to match native windows
|
||||||
core.exportVariable('HOME', ENV['HOMEDRIVE'] + ENV['HOMEPATH'])
|
core.exportVariable('HOME', os.homedir())
|
||||||
// bash - needed to maintain Path from Windows
|
// bash - needed to maintain Path from Windows
|
||||||
core.exportVariable('MSYS2_PATH_TYPE', 'inherit')
|
core.exportVariable('MSYS2_PATH_TYPE', 'inherit')
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -219,8 +219,8 @@ function envPreInstall() {
|
|||||||
if (windows) {
|
if (windows) {
|
||||||
// puts normal Ruby temp folder on SSD
|
// puts normal Ruby temp folder on SSD
|
||||||
core.exportVariable('TMPDIR', ENV['RUNNER_TEMP'])
|
core.exportVariable('TMPDIR', ENV['RUNNER_TEMP'])
|
||||||
// bash - sets home to match native windows, normally C:\Users\<user name>
|
// bash - sets home to match native windows
|
||||||
core.exportVariable('HOME', ENV['HOMEDRIVE'] + ENV['HOMEPATH'])
|
core.exportVariable('HOME', os.homedir())
|
||||||
// bash - needed to maintain Path from Windows
|
// bash - needed to maintain Path from Windows
|
||||||
core.exportVariable('MSYS2_PATH_TYPE', 'inherit')
|
core.exportVariable('MSYS2_PATH_TYPE', 'inherit')
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user