mirror of
https://github.com/ruby/setup-ruby.git
synced 2026-09-13 14:34:21 +02:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0481980f17 | ||
|
|
cf7216d52f |
@@ -165,6 +165,9 @@ export async function bundleInstall(gemfile, lockFile, platform, engine, rubyVer
|
|||||||
await exec.exec('bundle', ['lock'], envOptions)
|
await exec.exec('bundle', ['lock'], envOptions)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
await core.group(`Print lockfile`, async () =>
|
||||||
|
await exec.exec('cat', [lockFile]))
|
||||||
|
|
||||||
// cache key
|
// cache key
|
||||||
const paths = [cachePath]
|
const paths = [cachePath]
|
||||||
const baseKey = await computeBaseKey(engine, rubyVersion, lockFile, cacheVersion)
|
const baseKey = await computeBaseKey(engine, rubyVersion, lockFile, cacheVersion)
|
||||||
|
|||||||
+9
-24
@@ -179,6 +179,9 @@ async function bundleInstall(gemfile, lockFile, platform, engine, rubyVersion, b
|
|||||||
await exec.exec('bundle', ['lock'], envOptions)
|
await exec.exec('bundle', ['lock'], envOptions)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
await core.group(`Print lockfile`, async () =>
|
||||||
|
await exec.exec('cat', [lockFile]))
|
||||||
|
|
||||||
// cache key
|
// cache key
|
||||||
const paths = [cachePath]
|
const paths = [cachePath]
|
||||||
const baseKey = await computeBaseKey(engine, rubyVersion, lockFile, cacheVersion)
|
const baseKey = await computeBaseKey(engine, rubyVersion, lockFile, cacheVersion)
|
||||||
@@ -71269,7 +71272,6 @@ const tc = __nccwpck_require__(3472)
|
|||||||
const common = __nccwpck_require__(7211)
|
const common = __nccwpck_require__(7211)
|
||||||
const rubyBuilderVersions = __nccwpck_require__(1942)
|
const rubyBuilderVersions = __nccwpck_require__(1942)
|
||||||
|
|
||||||
const builderReleaseTag = 'toolcache'
|
|
||||||
const releasesURL = 'https://github.com/ruby/ruby-builder/releases'
|
const releasesURL = 'https://github.com/ruby/ruby-builder/releases'
|
||||||
|
|
||||||
const windows = common.windows
|
const windows = common.windows
|
||||||
@@ -71366,33 +71368,21 @@ async function downloadAndExtract(platform, engine, version, rubyPrefix) {
|
|||||||
function getDownloadURL(platform, engine, version) {
|
function getDownloadURL(platform, engine, version) {
|
||||||
let builderPlatform = null
|
let builderPlatform = null
|
||||||
if (platform.startsWith('windows-')) {
|
if (platform.startsWith('windows-')) {
|
||||||
if (os.arch() === 'x64') {
|
builderPlatform = `windows-${os.arch()}`
|
||||||
builderPlatform = 'windows-latest'
|
|
||||||
} else if (os.arch() === 'arm64') {
|
|
||||||
builderPlatform = 'windows-arm64'
|
|
||||||
}
|
|
||||||
} else if (platform.startsWith('macos-')) {
|
} else if (platform.startsWith('macos-')) {
|
||||||
if (os.arch() === 'x64') {
|
builderPlatform = `darwin-${os.arch()}`
|
||||||
builderPlatform = 'macos-latest'
|
|
||||||
} else if (os.arch() === 'arm64') {
|
|
||||||
builderPlatform = 'macos-13-arm64'
|
|
||||||
}
|
|
||||||
} else if (platform.startsWith('ubuntu-')) {
|
} else if (platform.startsWith('ubuntu-')) {
|
||||||
if (os.arch() === 'x64') {
|
builderPlatform = `${platform}-${os.arch()}`
|
||||||
builderPlatform = platform
|
|
||||||
} else if (os.arch() === 'arm64') {
|
|
||||||
builderPlatform = `${platform}-arm64`
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (builderPlatform === null) {
|
if (builderPlatform === null || !['x64', 'arm64'].includes(os.arch())) {
|
||||||
throw new Error(`Unknown download URL for platform ${platform}`)
|
throw new Error(`Unknown download URL for platform ${platform}-${os.arch()}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (common.isHeadVersion(version)) {
|
if (common.isHeadVersion(version)) {
|
||||||
return getLatestHeadBuildURL(builderPlatform, engine, version)
|
return getLatestHeadBuildURL(builderPlatform, engine, version)
|
||||||
} else {
|
} else {
|
||||||
return `${releasesURL}/download/${builderReleaseTag}/${engine}-${version}-${builderPlatform}.tar.gz`
|
return `${releasesURL}/download/${engine}-${version}/${engine}-${version}-${builderPlatform}.tar.gz`
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -85356,11 +85346,6 @@ async function setupRuby(options = {}) {
|
|||||||
if (inputs['bundler-cache'] === 'true') {
|
if (inputs['bundler-cache'] === 'true') {
|
||||||
await common.time('bundle install', async () =>
|
await common.time('bundle install', async () =>
|
||||||
bundler.bundleInstall(gemfile, lockFile, platform, engine, version, bundlerVersion, inputs['cache-version']))
|
bundler.bundleInstall(gemfile, lockFile, platform, engine, version, bundlerVersion, inputs['cache-version']))
|
||||||
|
|
||||||
if (lockFile !== null && fs.existsSync(lockFile)) {
|
|
||||||
await core.group(`Print lockfile`, async () =>
|
|
||||||
await exec.exec('cat', [lockFile]))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
core.setOutput('ruby-prefix', rubyPrefix)
|
core.setOutput('ruby-prefix', rubyPrefix)
|
||||||
|
|||||||
@@ -99,11 +99,6 @@ export async function setupRuby(options = {}) {
|
|||||||
if (inputs['bundler-cache'] === 'true') {
|
if (inputs['bundler-cache'] === 'true') {
|
||||||
await common.time('bundle install', async () =>
|
await common.time('bundle install', async () =>
|
||||||
bundler.bundleInstall(gemfile, lockFile, platform, engine, version, bundlerVersion, inputs['cache-version']))
|
bundler.bundleInstall(gemfile, lockFile, platform, engine, version, bundlerVersion, inputs['cache-version']))
|
||||||
|
|
||||||
if (lockFile !== null && fs.existsSync(lockFile)) {
|
|
||||||
await core.group(`Print lockfile`, async () =>
|
|
||||||
await exec.exec('cat', [lockFile]))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
core.setOutput('ruby-prefix', rubyPrefix)
|
core.setOutput('ruby-prefix', rubyPrefix)
|
||||||
|
|||||||
+6
-19
@@ -8,7 +8,6 @@ const tc = require('@actions/tool-cache')
|
|||||||
const common = require('./common')
|
const common = require('./common')
|
||||||
const rubyBuilderVersions = require('./ruby-builder-versions')
|
const rubyBuilderVersions = require('./ruby-builder-versions')
|
||||||
|
|
||||||
const builderReleaseTag = 'toolcache'
|
|
||||||
const releasesURL = 'https://github.com/ruby/ruby-builder/releases'
|
const releasesURL = 'https://github.com/ruby/ruby-builder/releases'
|
||||||
|
|
||||||
const windows = common.windows
|
const windows = common.windows
|
||||||
@@ -105,33 +104,21 @@ async function downloadAndExtract(platform, engine, version, rubyPrefix) {
|
|||||||
function getDownloadURL(platform, engine, version) {
|
function getDownloadURL(platform, engine, version) {
|
||||||
let builderPlatform = null
|
let builderPlatform = null
|
||||||
if (platform.startsWith('windows-')) {
|
if (platform.startsWith('windows-')) {
|
||||||
if (os.arch() === 'x64') {
|
builderPlatform = `windows-${os.arch()}`
|
||||||
builderPlatform = 'windows-latest'
|
|
||||||
} else if (os.arch() === 'arm64') {
|
|
||||||
builderPlatform = 'windows-arm64'
|
|
||||||
}
|
|
||||||
} else if (platform.startsWith('macos-')) {
|
} else if (platform.startsWith('macos-')) {
|
||||||
if (os.arch() === 'x64') {
|
builderPlatform = `darwin-${os.arch()}`
|
||||||
builderPlatform = 'macos-latest'
|
|
||||||
} else if (os.arch() === 'arm64') {
|
|
||||||
builderPlatform = 'macos-13-arm64'
|
|
||||||
}
|
|
||||||
} else if (platform.startsWith('ubuntu-')) {
|
} else if (platform.startsWith('ubuntu-')) {
|
||||||
if (os.arch() === 'x64') {
|
builderPlatform = `${platform}-${os.arch()}`
|
||||||
builderPlatform = platform
|
|
||||||
} else if (os.arch() === 'arm64') {
|
|
||||||
builderPlatform = `${platform}-arm64`
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (builderPlatform === null) {
|
if (builderPlatform === null || !['x64', 'arm64'].includes(os.arch())) {
|
||||||
throw new Error(`Unknown download URL for platform ${platform}`)
|
throw new Error(`Unknown download URL for platform ${platform}-${os.arch()}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (common.isHeadVersion(version)) {
|
if (common.isHeadVersion(version)) {
|
||||||
return getLatestHeadBuildURL(builderPlatform, engine, version)
|
return getLatestHeadBuildURL(builderPlatform, engine, version)
|
||||||
} else {
|
} else {
|
||||||
return `${releasesURL}/download/${builderReleaseTag}/${engine}-${version}-${builderPlatform}.tar.gz`
|
return `${releasesURL}/download/${engine}-${version}/${engine}-${version}-${builderPlatform}.tar.gz`
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user