From c7b7e65f7cc2b964358b7a841e0d090dd0b0af0a Mon Sep 17 00:00:00 2001 From: "shogo82148-slim[bot]" <90079370+shogo82148-slim[bot]@users.noreply.github.com> Date: Mon, 12 Dec 2022 10:49:30 +0900 Subject: [PATCH 1/2] update build tools (#1368) Co-authored-by: shogo82148-slim[bot] <90079370+shogo82148-slim[bot]@users.noreply.github.com> --- scripts/common/cpanfile.snapshot | 18 +++++++++--------- scripts/windows/cpanfile.snapshot | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/scripts/common/cpanfile.snapshot b/scripts/common/cpanfile.snapshot index 5d59471cc..f2bae5084 100644 --- a/scripts/common/cpanfile.snapshot +++ b/scripts/common/cpanfile.snapshot @@ -22,18 +22,18 @@ DISTRIBUTIONS overload 0 strict 0 warnings 0 - IO-Socket-SSL-2.077 - pathname: S/SU/SULLR/IO-Socket-SSL-2.077.tar.gz + IO-Socket-SSL-2.078 + pathname: S/SU/SULLR/IO-Socket-SSL-2.078.tar.gz provides: - IO::Socket::SSL 2.077 + IO::Socket::SSL 2.078 IO::Socket::SSL::Intercept 2.056 - IO::Socket::SSL::OCSP_Cache 2.077 - IO::Socket::SSL::OCSP_Resolver 2.077 + IO::Socket::SSL::OCSP_Cache 2.078 + IO::Socket::SSL::OCSP_Resolver 2.078 IO::Socket::SSL::PublicSuffix undef - IO::Socket::SSL::SSL_Context 2.077 - IO::Socket::SSL::SSL_HANDLE 2.077 - IO::Socket::SSL::Session_Cache 2.077 - IO::Socket::SSL::Trace 2.077 + IO::Socket::SSL::SSL_Context 2.078 + IO::Socket::SSL::SSL_HANDLE 2.078 + IO::Socket::SSL::Session_Cache 2.078 + IO::Socket::SSL::Trace 2.078 IO::Socket::SSL::Utils 2.015 requirements: ExtUtils::MakeMaker 0 diff --git a/scripts/windows/cpanfile.snapshot b/scripts/windows/cpanfile.snapshot index 27d0a57bb..603cdbb37 100644 --- a/scripts/windows/cpanfile.snapshot +++ b/scripts/windows/cpanfile.snapshot @@ -238,18 +238,18 @@ DISTRIBUTIONS Exporter 5.57 ExtUtils::MakeMaker 0 perl 5.008 - IO-Socket-SSL-2.077 - pathname: S/SU/SULLR/IO-Socket-SSL-2.077.tar.gz + IO-Socket-SSL-2.078 + pathname: S/SU/SULLR/IO-Socket-SSL-2.078.tar.gz provides: - IO::Socket::SSL 2.077 + IO::Socket::SSL 2.078 IO::Socket::SSL::Intercept 2.056 - IO::Socket::SSL::OCSP_Cache 2.077 - IO::Socket::SSL::OCSP_Resolver 2.077 + IO::Socket::SSL::OCSP_Cache 2.078 + IO::Socket::SSL::OCSP_Resolver 2.078 IO::Socket::SSL::PublicSuffix undef - IO::Socket::SSL::SSL_Context 2.077 - IO::Socket::SSL::SSL_HANDLE 2.077 - IO::Socket::SSL::Session_Cache 2.077 - IO::Socket::SSL::Trace 2.077 + IO::Socket::SSL::SSL_Context 2.078 + IO::Socket::SSL::SSL_HANDLE 2.078 + IO::Socket::SSL::Session_Cache 2.078 + IO::Socket::SSL::Trace 2.078 IO::Socket::SSL::Utils 2.015 requirements: ExtUtils::MakeMaker 0 From 7e229328af176b4ae97ec1c6ee280990a614b165 Mon Sep 17 00:00:00 2001 From: ICHINOSE Shogo Date: Mon, 12 Dec 2022 21:15:55 +0900 Subject: [PATCH 2/2] fix: Error about missing .python-version file #1369 (#1370) * fix the default value of the perl-version-file input * fallback to the default version 5 * npm run format --- src/setup-perl.ts | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/setup-perl.ts b/src/setup-perl.ts index 3687ac458..bf3bce5f5 100644 --- a/src/setup-perl.ts +++ b/src/setup-perl.ts @@ -106,10 +106,19 @@ async function resolveVersionInput(): Promise { return version; } - const versionFilePath = path.join(process.env.GITHUB_WORKSPACE || "", versionFile || ".python-version"); - version = await fs.readFile(versionFilePath, "utf8"); - core.info(`Resolved ${versionFile} as ${version}`); - return version; + try { + const versionFilePath = path.join(process.env.GITHUB_WORKSPACE || "", versionFile || ".perl-version"); + version = await fs.readFile(versionFilePath, "utf8"); + core.info(`Resolved ${versionFile} as ${version}`); + return version; + } catch (err) { + if ((err as any)?.code !== "ENOENT" || versionFile) { + throw err; + } + } + + // use the default version. + return "5"; } run();