Merge branch 'main' into releases/v1

shogo82148 · Dec 12, 2022 · 26c6070 · 26c6070
2 parents e324fe3 + 7e22932
commit 26c6070
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 22 deletions.
diff --git 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
@@ -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

diff --git a/src/setup-perl.ts b/src/setup-perl.ts
@@ -106,10 +106,19 @@ async function resolveVersionInput(): Promise<string> {
     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();