Actions/setup-godot
1
Fork 0
mirror of https://github.com/chickensoft-games/setup-godot.git synced 2025-08-15 05:15:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run format tools and make sure npm all passes

Browse Source
This commit is contained in:
Will Jordan 2024-03-25 12:28:55 +01:00
parent 1dc3741f47
commit 5be5f5d093
3 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dist/index.js generated vendored
View File

@ -91,9 +91,15 @@ function run(platform) {
const godotDownloadPath = path_1.default.join(downloadsDir, `${versionName}.zip`); const godotDownloadPath = path_1.default.join(downloadsDir, `${versionName}.zip`);
const godotInstallationPath = platform.getUnzippedPath(installationDir, versionName, useDotnet); const godotInstallationPath = platform.getUnzippedPath(installationDir, versionName, useDotnet);
const binDir = path_1.default.join(userDir, binRelativePath); const binDir = path_1.default.join(userDir, binRelativePath);
const exportTemplateUrl = includeTemplates ? (0, utils_1.getGodotUrl)(version, platform, useDotnet, true) : ''; const exportTemplateUrl = includeTemplates
const exportTemplatePath = includeTemplates ? (0, utils_1.getExportTemplatePath)(version, platform, useDotnet) : ''; ? (0, utils_1.getGodotUrl)(version, platform, useDotnet, true)
const exportTemplateDownloadPath = includeTemplates ? path_1.default.join(downloadsDir, 'export_templates.zip') : ''; : '';
const exportTemplatePath = includeTemplates
? (0, utils_1.getExportTemplatePath)(version, platform, useDotnet)
: '';
const exportTemplateDownloadPath = includeTemplates
? path_1.default.join(downloadsDir, 'export_templates.zip')
: '';
core.info(`🤖 Godot version: ${version}`); core.info(`🤖 Godot version: ${version}`);
core.info(`🤖 Godot version name: ${versionName}`); core.info(`🤖 Godot version name: ${versionName}`);
core.info(`🟣 Use .NET: ${useDotnet}`); core.info(`🟣 Use .NET: ${useDotnet}`);
@ -124,8 +130,10 @@ function run(platform) {
core.endGroup(); core.endGroup();
// See if Godot is already installed. // See if Godot is already installed.
core.startGroup(`🤔 Checking if Godot is already in cache...`); core.startGroup(`🤔 Checking if Godot is already in cache...`);
const cachedPaths = includeTemplates ? [godotInstallationPath, exportTemplatePath] : [godotInstallationPath]; const cachedPaths = includeTemplates
const cacheKey = includeTemplates ? godotUrl : godotUrl + '-no-templates'; ? [godotInstallationPath, exportTemplatePath]
: [godotInstallationPath];
const cacheKey = includeTemplates ? godotUrl : `${godotUrl}-no-templates`;
const cached = yield cache.restoreCache(cachedPaths.slice(), cacheKey); const cached = yield cache.restoreCache(cachedPaths.slice(), cacheKey);
let executables; let executables;
if (!cached) { if (!cached) {
@ -2976,7 +2984,7 @@ class OidcClient {
.catch(error => { .catch(error => {
throw new Error(`Failed to get ID Token. \n throw new Error(`Failed to get ID Token. \n
Error Code : ${error.statusCode}\n Error Code : ${error.statusCode}\n
Error Message: ${error.result.message}`); Error Message: ${error.message}`);
}); });
const id_token = (_a = res.result) === null || _a === void 0 ? void 0 : _a.value; const id_token = (_a = res.result) === null || _a === void 0 ? void 0 : _a.value;
if (!id_token) { if (!id_token) {

2
dist/index.js.map generated vendored
View File

File diff suppressed because one or more lines are too long

34
src/main.ts
View File

@ -75,12 +75,15 @@ async function run(platform: Platform): Promise<void> {
) )
const binDir = path.join(userDir, binRelativePath) const binDir = path.join(userDir, binRelativePath)
const exportTemplateUrl = includeTemplates ? getGodotUrl(version, platform, useDotnet, true) : '' const exportTemplateUrl = includeTemplates
const exportTemplatePath = includeTemplates ? getExportTemplatePath(version, platform, useDotnet) : '' ? getGodotUrl(version, platform, useDotnet, true)
const exportTemplateDownloadPath = includeTemplates ? path.join( : ''
downloadsDir, const exportTemplatePath = includeTemplates
'export_templates.zip' ? getExportTemplatePath(version, platform, useDotnet)
) : '' : ''
const exportTemplateDownloadPath = includeTemplates
? path.join(downloadsDir, 'export_templates.zip')
: ''
core.info(`🤖 Godot version: ${version}`) core.info(`🤖 Godot version: ${version}`)
core.info(`🤖 Godot version name: ${versionName}`) core.info(`🤖 Godot version name: ${versionName}`)
@ -116,12 +119,11 @@ async function run(platform: Platform): Promise<void> {
// See if Godot is already installed. // See if Godot is already installed.
core.startGroup(`🤔 Checking if Godot is already in cache...`) core.startGroup(`🤔 Checking if Godot is already in cache...`)
const cachedPaths = includeTemplates ? [ godotInstallationPath, exportTemplatePath] : [ godotInstallationPath ] const cachedPaths = includeTemplates
const cacheKey = includeTemplates ? godotUrl : godotUrl + '-no-templates' ? [godotInstallationPath, exportTemplatePath]
const cached = await cache.restoreCache( : [godotInstallationPath]
cachedPaths.slice(), const cacheKey = includeTemplates ? godotUrl : `${godotUrl}-no-templates`
cacheKey const cached = await cache.restoreCache(cachedPaths.slice(), cacheKey)
)
let executables: string[] let executables: string[]
if (!cached) { if (!cached) {
@ -141,7 +143,6 @@ async function run(platform: Platform): Promise<void> {
core.info(`✅ Godot downloaded to ${godotDownloadedPath}`) core.info(`✅ Godot downloaded to ${godotDownloadedPath}`)
core.endGroup() core.endGroup()
// Extract Godot // Extract Godot
core.startGroup(`📦 Extracting Godot to ${installationDir}...`) core.startGroup(`📦 Extracting Godot to ${installationDir}...`)
@ -166,7 +167,6 @@ async function run(platform: Platform): Promise<void> {
core.info(`✅ Files shown`) core.info(`✅ Files shown`)
core.endGroup() core.endGroup()
if (includeTemplates) { if (includeTemplates) {
core.startGroup( core.startGroup(
`📥 Downloading Export Templates to ${exportTemplateDownloadPath}...` `📥 Downloading Export Templates to ${exportTemplateDownloadPath}...`
@ -183,7 +183,6 @@ async function run(platform: Platform): Promise<void> {
core.info(`✅ Export Templates downloaded to ${templateDownloadedPath}`) core.info(`✅ Export Templates downloaded to ${templateDownloadedPath}`)
core.endGroup() core.endGroup()
core.startGroup( core.startGroup(
`📦 Extracting Export Templates to ${exportTemplatePath}...` `📦 Extracting Export Templates to ${exportTemplatePath}...`
) )
@ -220,10 +219,7 @@ async function run(platform: Platform): Promise<void> {
// Save extracted Godot contents to cache // Save extracted Godot contents to cache
core.startGroup(`💾 Saving extracted Godot download to cache...`) core.startGroup(`💾 Saving extracted Godot download to cache...`)
await cache.saveCache( await cache.saveCache(cachedPaths, cacheKey)
cachedPaths,
cacheKey
)
core.info(`✅ Godot saved to cache`) core.info(`✅ Godot saved to cache`)
core.endGroup() core.endGroup()
} else { } else {