Skip to content

Commit 1f5d8b5

Browse files
authored
Run prettier 1.18.2 (#4)
* Run prettier 1.18.2 Run specific version of prettier as newer versions will output different results which do not pass the build.
1 parent 1680163 commit 1f5d8b5

File tree

3 files changed

+29
-31
lines changed

3 files changed

+29
-31
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);

lib/installer.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ function getProtoc(version, includePreReleases, repoToken) {
7474
listeners: {
7575
stdout: (data) => {
7676
stdOut += data.toString();
77-
},
78-
},
77+
}
78+
}
7979
};
8080
yield exc.exec("go", ["env", "GOPATH"], options);
8181
const goPath = stdOut.trim();
@@ -127,7 +127,7 @@ function fetchVersions(includePreReleases, repoToken) {
127127
let rest;
128128
if (repoToken != "") {
129129
rest = new restm.RestClient("setup-protoc", "", [], {
130-
headers: { Authorization: "Bearer " + repoToken },
130+
headers: { Authorization: "Bearer " + repoToken }
131131
});
132132
}
133133
else {
@@ -145,9 +145,9 @@ function fetchVersions(includePreReleases, repoToken) {
145145
}
146146
}
147147
return tags
148-
.filter((tag) => tag.tag_name.match(/v\d+\.[\w\.]+/g))
149-
.filter((tag) => includePrerelease(tag.prerelease, includePreReleases))
150-
.map((tag) => tag.tag_name.replace("v", ""));
148+
.filter(tag => tag.tag_name.match(/v\d+\.[\w\.]+/g))
149+
.filter(tag => includePrerelease(tag.prerelease, includePreReleases))
150+
.map(tag => tag.tag_name.replace("v", ""));
151151
});
152152
}
153153
// Compute an actual version starting from the `version` configuration param.
@@ -162,13 +162,13 @@ function computeVersion(version, includePreReleases, repoToken) {
162162
version = version.slice(0, version.length - 2);
163163
}
164164
const allVersions = yield fetchVersions(includePreReleases, repoToken);
165-
const validVersions = allVersions.filter((v) => semver.valid(v));
166-
const possibleVersions = validVersions.filter((v) => v.startsWith(version));
165+
const validVersions = allVersions.filter(v => semver.valid(v));
166+
const possibleVersions = validVersions.filter(v => v.startsWith(version));
167167
const versionMap = new Map();
168-
possibleVersions.forEach((v) => versionMap.set(normalizeVersion(v), v));
168+
possibleVersions.forEach(v => versionMap.set(normalizeVersion(v), v));
169169
const versions = Array.from(versionMap.keys())
170170
.sort(semver.rcompare)
171-
.map((v) => versionMap.get(v));
171+
.map(v => versionMap.get(v));
172172
core.debug(`evaluating ${versions.length} versions`);
173173
if (versions.length === 0) {
174174
throw new Error("unable to get latest version");
@@ -190,7 +190,7 @@ function normalizeVersion(version) {
190190
else {
191191
// handle beta and rc
192192
// e.g. 1.10beta1 -? 1.10.0-beta1, 1.10rc1 -> 1.10.0-rc1
193-
if (preStrings.some((el) => versionPart[1].includes(el))) {
193+
if (preStrings.some(el => versionPart[1].includes(el))) {
194194
versionPart[1] = versionPart[1]
195195
.replace("beta", ".0-beta")
196196
.replace("rc", ".0-rc")
@@ -206,7 +206,7 @@ function normalizeVersion(version) {
206206
else {
207207
// handle beta and rc
208208
// e.g. 1.8.5beta1 -> 1.8.5-beta1, 1.8.5rc1 -> 1.8.5-rc1
209-
if (preStrings.some((el) => versionPart[2].includes(el))) {
209+
if (preStrings.some(el => versionPart[2].includes(el))) {
210210
versionPart[2] = versionPart[2]
211211
.replace("beta", "-beta")
212212
.replace("rc", "-rc")

src/installer.ts

Lines changed: 16 additions & 18 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);
@@ -143,7 +143,7 @@ async function fetchVersions(
143143
let rest: restm.RestClient;
144144
if (repoToken != "") {
145145
rest = new restm.RestClient("setup-protoc", "", [], {
146-
headers: { Authorization: "Bearer " + repoToken },
146+
headers: { Authorization: "Bearer " + repoToken }
147147
});
148148
} else {
149149
rest = new restm.RestClient("setup-protoc");
@@ -152,12 +152,10 @@ async function fetchVersions(
152152
let tags: IProtocRelease[] = [];
153153
for (let pageNum = 1, morePages = true; morePages; pageNum++) {
154154
let nextPage: IProtocRelease[] =
155-
(
156-
await rest.get<IProtocRelease[]>(
157-
"https://api.github.com/repos/protocolbuffers/protobuf/releases?page=" +
158-
pageNum
159-
)
160-
).result || [];
155+
(await rest.get<IProtocRelease[]>(
156+
"https://api.github.com/repos/protocolbuffers/protobuf/releases?page=" +
157+
pageNum
158+
)).result || [];
161159
if (nextPage.length > 0) {
162160
tags = tags.concat(nextPage);
163161
} else {
@@ -166,9 +164,9 @@ async function fetchVersions(
166164
}
167165

168166
return tags
169-
.filter((tag) => tag.tag_name.match(/v\d+\.[\w\.]+/g))
170-
.filter((tag) => includePrerelease(tag.prerelease, includePreReleases))
171-
.map((tag) => tag.tag_name.replace("v", ""));
167+
.filter(tag => tag.tag_name.match(/v\d+\.[\w\.]+/g))
168+
.filter(tag => includePrerelease(tag.prerelease, includePreReleases))
169+
.map(tag => tag.tag_name.replace("v", ""));
172170
}
173171

174172
// Compute an actual version starting from the `version` configuration param.
@@ -188,15 +186,15 @@ async function computeVersion(
188186
}
189187

190188
const allVersions = await fetchVersions(includePreReleases, repoToken);
191-
const validVersions = allVersions.filter((v) => semver.valid(v));
192-
const possibleVersions = validVersions.filter((v) => v.startsWith(version));
189+
const validVersions = allVersions.filter(v => semver.valid(v));
190+
const possibleVersions = validVersions.filter(v => v.startsWith(version));
193191

194192
const versionMap = new Map();
195-
possibleVersions.forEach((v) => versionMap.set(normalizeVersion(v), v));
193+
possibleVersions.forEach(v => versionMap.set(normalizeVersion(v), v));
196194

197195
const versions = Array.from(versionMap.keys())
198196
.sort(semver.rcompare)
199-
.map((v) => versionMap.get(v));
197+
.map(v => versionMap.get(v));
200198

201199
core.debug(`evaluating ${versions.length} versions`);
202200

@@ -222,7 +220,7 @@ function normalizeVersion(version: string): string {
222220
} else {
223221
// handle beta and rc
224222
// e.g. 1.10beta1 -? 1.10.0-beta1, 1.10rc1 -> 1.10.0-rc1
225-
if (preStrings.some((el) => versionPart[1].includes(el))) {
223+
if (preStrings.some(el => versionPart[1].includes(el))) {
226224
versionPart[1] = versionPart[1]
227225
.replace("beta", ".0-beta")
228226
.replace("rc", ".0-rc")
@@ -238,7 +236,7 @@ function normalizeVersion(version: string): string {
238236
} else {
239237
// handle beta and rc
240238
// e.g. 1.8.5beta1 -> 1.8.5-beta1, 1.8.5rc1 -> 1.8.5-rc1
241-
if (preStrings.some((el) => versionPart[2].includes(el))) {
239+
if (preStrings.some(el => versionPart[2].includes(el))) {
242240
versionPart[2] = versionPart[2]
243241
.replace("beta", "-beta")
244242
.replace("rc", "-rc")

0 commit comments

Comments
 (0)