Skip to content

Commit

Permalink
Bump typescript from 4.3.5 to 4.4.2 (#829)
Browse files Browse the repository at this point in the history
* Bump typescript from 4.3.5 to 4.4.2

Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.3.5 to 4.4.2.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](microsoft/TypeScript@v4.3.5...v4.4.2)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* fix compile errors

* npm run format

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ichinose Shogo <shogo82148@gmail.com>
  • Loading branch information
dependabot[bot] and shogo82148 committed Aug 28, 2021
1 parent 5ebf7b9 commit 0a69ab6
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 21 deletions.
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@
"jest-circus": "^27.0.6",
"prettier": "^2.3.2",
"ts-jest": "^27.0.5",
"typescript": "^4.3.5"
"typescript": "^4.4.2"
}
}
24 changes: 16 additions & 8 deletions src/cpan-installer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,13 @@ export async function install(opt: Options): Promise<void> {
try {
cachedKey = await cache.restoreCache(paths, key, restoreKeys);
} catch (error) {
if (error.name === cache.ValidationError.name) {
if (error instanceof Error) {
if (error.name === cache.ValidationError.name) {
} else {
core.info(`[warning] There was an error restoring the cache ${error.message}`);
}
} else {
core.info(`[warning] There was an error restoring the cache ${error.message}`);
core.info(`[warning] There was an error restoring the cache ${error}`);
}
}
if (cachedKey) {
Expand All @@ -88,12 +92,16 @@ export async function install(opt: Options): Promise<void> {
try {
await cache.saveCache(paths, key);
} catch (error) {
if (error.name === cache.ValidationError.name) {
throw error;
} else if (error.name === cache.ReserveCacheError.name) {
core.info(error.message);
if (error instanceof Error) {
if (error.name === cache.ValidationError.name) {
throw error;
} else if (error.name === cache.ReserveCacheError.name) {
core.info(error.message);
} else {
core.info(`[warning]${error.message}`);
}
} else {
core.info(`[warning]${error.message}`);
core.info(`[warning]${error}`);
}
}
} else {
Expand Down Expand Up @@ -141,7 +149,7 @@ async function hashFiles(opt: Options, ...files: string[]): Promise<string> {
result.write(hash.digest());
} catch (err) {
// skip files that doesn't exist.
if (err.code !== 'ENOENT') {
if ((err as any)?.code !== 'ENOENT') {
throw err;
}
}
Expand Down
8 changes: 6 additions & 2 deletions src/installer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,13 @@ async function acquirePerl(version: string, thread: boolean): Promise<string> {
try {
downloadPath = await tc.downloadTool(downloadUrl);
} catch (error) {
core.debug(error);
if (error instanceof Error) {
core.debug(error.message);
} else {
core.debug(`${error}`);
}

throw `Failed to download version ${version}: ${error}`;
throw new Error(`Failed to download version ${version}: ${error}`);
}

//
Expand Down
6 changes: 5 additions & 1 deletion src/setup-perl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,11 @@ async function run() {
});
});
} catch (error) {
core.setFailed(error.message);
if (error instanceof Error) {
core.setFailed(error);
} else {
core.setFailed(`${error}`);
}
}
}

Expand Down
8 changes: 6 additions & 2 deletions src/strawberry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,13 @@ async function acquirePerl(version: PerlVersion): Promise<string> {
try {
downloadPath = await tc.downloadTool(downloadUrl);
} catch (error) {
core.debug(error);
if (error instanceof Error) {
core.debug(error.message);
} else {
core.debug(`${error}`);
}

throw `Failed to download version ${version.version}: ${error}`;
throw new Error(`Failed to download version ${version}: ${error}`);
}

const extPath = await tc.extractZip(downloadPath);
Expand Down

0 comments on commit 0a69ab6

Please sign in to comment.