Skip to content

Commit 01992ea

Browse files
authored
Merge pull request #30 from per1234/dependabot/npm_and_yarn/prettier-2.2.1
build(deps-dev): bump prettier from 1.18.2 to 2.2.1
2 parents 65b32c2 + 80db48c commit 01992ea

File tree

5 files changed

+31
-23
lines changed

5 files changed

+31
-23
lines changed

.github/workflows/setup-taskflile.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ jobs:
1313
operating-system: [ubuntu-latest, windows-latest]
1414

1515
steps:
16+
# GitHub Actions has the annoying behavior of converting LF to CRLF when checking out on the Windows runner
17+
- name: Disable EOL conversions
18+
run: git config --global core.autocrlf false
19+
1620
- name: Checkout
1721
uses: actions/checkout@master
1822

dist/index.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,16 @@ function fetchVersions(repoToken) {
7979
let rest;
8080
if (repoToken !== "") {
8181
rest = new restm.RestClient("setup-task", "", [], {
82-
headers: { Authorization: `Bearer ${repoToken}` }
82+
headers: { Authorization: `Bearer ${repoToken}` },
8383
});
8484
}
8585
else {
8686
rest = new restm.RestClient("setup-task");
8787
}
8888
const tags = (yield rest.get("https://api.github.com/repos/go-task/task/git/refs/tags")).result || [];
8989
return tags
90-
.filter(tag => tag.ref.match(/v\d+\.[\w\.]+/g))
91-
.map(tag => tag.ref.replace("refs/tags/v", ""));
90+
.filter((tag) => tag.ref.match(/v\d+\.[\w\.]+/g))
91+
.map((tag) => tag.ref.replace("refs/tags/v", ""));
9292
});
9393
}
9494
// Make partial versions semver compliant.
@@ -102,7 +102,7 @@ function normalizeVersion(version) {
102102
}
103103
// handle beta and rc
104104
// e.g. 1.10beta1 -? 1.10.0-beta1, 1.10rc1 -> 1.10.0-rc1
105-
if (preStrings.some(el => versionPart[1].includes(el))) {
105+
if (preStrings.some((el) => versionPart[1].includes(el))) {
106106
versionPart[1] = versionPart[1]
107107
.replace("beta", ".0-beta")
108108
.replace("rc", ".0-rc")
@@ -116,7 +116,7 @@ function normalizeVersion(version) {
116116
}
117117
// handle beta and rc
118118
// e.g. 1.8.5beta1 -> 1.8.5-beta1, 1.8.5rc1 -> 1.8.5-rc1
119-
if (preStrings.some(el => versionPart[2].includes(el))) {
119+
if (preStrings.some((el) => versionPart[2].includes(el))) {
120120
versionPart[2] = versionPart[2]
121121
.replace("beta", "-beta")
122122
.replace("rc", "-rc")
@@ -143,12 +143,12 @@ function computeVersion(version, repoToken) {
143143
versionPrefix = versionPrefix.slice(0, versionPrefix.length - 2);
144144
}
145145
const allVersions = yield fetchVersions(repoToken);
146-
const possibleVersions = allVersions.filter(v => v.startsWith(versionPrefix));
146+
const possibleVersions = allVersions.filter((v) => v.startsWith(versionPrefix));
147147
const versionMap = new Map();
148-
possibleVersions.forEach(v => versionMap.set(normalizeVersion(v), v));
148+
possibleVersions.forEach((v) => versionMap.set(normalizeVersion(v), v));
149149
const versions = Array.from(versionMap.keys())
150150
.sort(semver.rcompare)
151-
.map(v => versionMap.get(v));
151+
.map((v) => versionMap.get(v));
152152
core.debug(`evaluating ${versions.length} versions`);
153153
if (versions.length === 0) {
154154
throw new Error("unable to get latest version");

package-lock.json

Lines changed: 3 additions & 3 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
@@ -40,7 +40,7 @@
4040
"eslint-plugin-import": "^2.22.1",
4141
"jest": "^24.9.0",
4242
"jest-circus": "^26.6.3",
43-
"prettier": "^1.17.1",
43+
"prettier": "^2.2.1",
4444
"nock": "^13.0.11",
4545
"ts-jest": "^24.0.2",
4646
"typescript": "^4.2.4"

src/installer.ts

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,20 +48,22 @@ async function fetchVersions(repoToken: string): Promise<string[]> {
4848
let rest: restm.RestClient;
4949
if (repoToken !== "") {
5050
rest = new restm.RestClient("setup-task", "", [], {
51-
headers: { Authorization: `Bearer ${repoToken}` }
51+
headers: { Authorization: `Bearer ${repoToken}` },
5252
});
5353
} else {
5454
rest = new restm.RestClient("setup-task");
5555
}
5656

5757
const tags: ITaskRef[] =
58-
(await rest.get<ITaskRef[]>(
59-
"https://api.github.com/repos/go-task/task/git/refs/tags"
60-
)).result || [];
58+
(
59+
await rest.get<ITaskRef[]>(
60+
"https://api.github.com/repos/go-task/task/git/refs/tags"
61+
)
62+
).result || [];
6163

6264
return tags
63-
.filter(tag => tag.ref.match(/v\d+\.[\w\.]+/g))
64-
.map(tag => tag.ref.replace("refs/tags/v", ""));
65+
.filter((tag) => tag.ref.match(/v\d+\.[\w\.]+/g))
66+
.map((tag) => tag.ref.replace("refs/tags/v", ""));
6567
}
6668

6769
// Make partial versions semver compliant.
@@ -76,7 +78,7 @@ function normalizeVersion(version: string): string {
7678
}
7779
// handle beta and rc
7880
// e.g. 1.10beta1 -? 1.10.0-beta1, 1.10rc1 -> 1.10.0-rc1
79-
if (preStrings.some(el => versionPart[1].includes(el))) {
81+
if (preStrings.some((el) => versionPart[1].includes(el))) {
8082
versionPart[1] = versionPart[1]
8183
.replace("beta", ".0-beta")
8284
.replace("rc", ".0-rc")
@@ -91,7 +93,7 @@ function normalizeVersion(version: string): string {
9193
}
9294
// handle beta and rc
9395
// e.g. 1.8.5beta1 -> 1.8.5-beta1, 1.8.5rc1 -> 1.8.5-rc1
94-
if (preStrings.some(el => versionPart[2].includes(el))) {
96+
if (preStrings.some((el) => versionPart[2].includes(el))) {
9597
versionPart[2] = versionPart[2]
9698
.replace("beta", "-beta")
9799
.replace("rc", "-rc")
@@ -125,14 +127,16 @@ async function computeVersion(
125127
}
126128

127129
const allVersions = await fetchVersions(repoToken);
128-
const possibleVersions = allVersions.filter(v => v.startsWith(versionPrefix));
130+
const possibleVersions = allVersions.filter((v) =>
131+
v.startsWith(versionPrefix)
132+
);
129133

130134
const versionMap = new Map();
131-
possibleVersions.forEach(v => versionMap.set(normalizeVersion(v), v));
135+
possibleVersions.forEach((v) => versionMap.set(normalizeVersion(v), v));
132136

133137
const versions = Array.from(versionMap.keys())
134138
.sort(semver.rcompare)
135-
.map(v => versionMap.get(v));
139+
.map((v) => versionMap.get(v));
136140

137141
core.debug(`evaluating ${versions.length} versions`);
138142

0 commit comments

Comments
 (0)