Skip to content

Commit ff96198

Browse files
bump prettier to 2.8.4
1 parent 45e0202 commit ff96198

File tree

4 files changed

+31
-26
lines changed

4 files changed

+31
-26
lines changed

__tests__/main.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ process.env["RUNNER_TOOL_CACHE"] = toolDir;
1515
import * as installer from "../src/installer";
1616

1717
describe("installer tests", () => {
18-
beforeEach(async function() {
18+
beforeEach(async function () {
1919
await io.rmRF(toolDir);
2020
await io.rmRF(tempDir);
2121
await io.mkdirP(toolDir);

package-lock.json

Lines changed: 11 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"markdown-link-check": "^3.10.2",
4848
"markdownlint-cli": "^0.32.2",
4949
"nock": "^10.0.6",
50-
"prettier": "^1.17.1",
50+
"prettier": "^2.8.4",
5151
"ts-jest": "^27.0.5",
5252
"typescript": "^4.9.5"
5353
}

src/installer.ts

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ export async function getProtoc(
7777
listeners: {
7878
stdout: (data: Buffer) => {
7979
stdOut += data.toString();
80-
}
81-
}
80+
},
81+
},
8282
};
8383

8484
await exc.exec("go", ["env", "GOPATH"], options);
@@ -146,7 +146,7 @@ async function fetchVersions(
146146
let rest: restm.RestClient;
147147
if (repoToken != "") {
148148
rest = new restm.RestClient("setup-protoc", "", [], {
149-
headers: { Authorization: "Bearer " + repoToken }
149+
headers: { Authorization: "Bearer " + repoToken },
150150
});
151151
} else {
152152
rest = new restm.RestClient("setup-protoc");
@@ -155,10 +155,12 @@ async function fetchVersions(
155155
let tags: IProtocRelease[] = [];
156156
for (let pageNum = 1, morePages = true; morePages; pageNum++) {
157157
let nextPage: IProtocRelease[] =
158-
(await rest.get<IProtocRelease[]>(
159-
"https://api.github.com/repos/protocolbuffers/protobuf/releases?page=" +
160-
pageNum
161-
)).result || [];
158+
(
159+
await rest.get<IProtocRelease[]>(
160+
"https://api.github.com/repos/protocolbuffers/protobuf/releases?page=" +
161+
pageNum
162+
)
163+
).result || [];
162164
if (nextPage.length > 0) {
163165
tags = tags.concat(nextPage);
164166
} else {
@@ -167,9 +169,9 @@ async function fetchVersions(
167169
}
168170

169171
return tags
170-
.filter(tag => tag.tag_name.match(/v\d+\.[\w\.]+/g))
171-
.filter(tag => includePrerelease(tag.prerelease, includePreReleases))
172-
.map(tag => tag.tag_name.replace("v", ""));
172+
.filter((tag) => tag.tag_name.match(/v\d+\.[\w\.]+/g))
173+
.filter((tag) => includePrerelease(tag.prerelease, includePreReleases))
174+
.map((tag) => tag.tag_name.replace("v", ""));
173175
}
174176

175177
// Compute an actual version starting from the `version` configuration param.
@@ -189,15 +191,15 @@ async function computeVersion(
189191
}
190192

191193
const allVersions = await fetchVersions(includePreReleases, repoToken);
192-
const validVersions = allVersions.filter(v => semver.valid(v));
193-
const possibleVersions = validVersions.filter(v => v.startsWith(version));
194+
const validVersions = allVersions.filter((v) => semver.valid(v));
195+
const possibleVersions = validVersions.filter((v) => v.startsWith(version));
194196

195197
const versionMap = new Map();
196-
possibleVersions.forEach(v => versionMap.set(normalizeVersion(v), v));
198+
possibleVersions.forEach((v) => versionMap.set(normalizeVersion(v), v));
197199

198200
const versions = Array.from(versionMap.keys())
199201
.sort(semver.rcompare)
200-
.map(v => versionMap.get(v));
202+
.map((v) => versionMap.get(v));
201203

202204
core.debug(`evaluating ${versions.length} versions`);
203205

@@ -223,7 +225,7 @@ function normalizeVersion(version: string): string {
223225
} else {
224226
// handle beta and rc
225227
// e.g. 1.10beta1 -? 1.10.0-beta1, 1.10rc1 -> 1.10.0-rc1
226-
if (preStrings.some(el => versionPart[1].includes(el))) {
228+
if (preStrings.some((el) => versionPart[1].includes(el))) {
227229
versionPart[1] = versionPart[1]
228230
.replace("beta", ".0-beta")
229231
.replace("rc", ".0-rc")
@@ -239,7 +241,7 @@ function normalizeVersion(version: string): string {
239241
} else {
240242
// handle beta and rc
241243
// e.g. 1.8.5beta1 -> 1.8.5-beta1, 1.8.5rc1 -> 1.8.5-rc1
242-
if (preStrings.some(el => versionPart[2].includes(el))) {
244+
if (preStrings.some((el) => versionPart[2].includes(el))) {
243245
versionPart[2] = versionPart[2]
244246
.replace("beta", "-beta")
245247
.replace("rc", "-rc")

0 commit comments

Comments
 (0)