Skip to content

Commit 775ff23

Browse files
committed
feat: improve default versions for non-LTS ubuntus
1 parent 95a1362 commit 775ff23

File tree

8 files changed

+20
-18
lines changed

8 files changed

+20
-18
lines changed

dist/node12/actions_python.783c56a8.js

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

dist/node12/actions_python.bdb5f7a5.js.map renamed to dist/node12/actions_python.783c56a8.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/node12/actions_python.bdb5f7a5.js

Lines changed: 0 additions & 6 deletions
This file was deleted.

dist/node12/setup-cpp.js

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

dist/node12/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/node16/setup-cpp.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/node16/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/versions/versions.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@ export function getVersion(name: string, version: string | undefined, osVersion:
1818
/// choose the default linux version based on ubuntu version
1919
function getDefaultLinuxVersion(name: string, osVersion: number[]) {
2020
const osVersionMaj = osVersion[0]
21-
const newest = parseInt(Object.keys(DefaultLinuxVersion[name])[0], 10) // newest version with the default
22-
if (osVersionMaj >= newest) {
23-
return DefaultLinuxVersion[name][osVersionMaj]
24-
} else {
25-
return ""
26-
}
21+
22+
// find which version block the os version is in
23+
const satisfyingVersion = Object.keys(DefaultLinuxVersion[name])
24+
.map((v) => parseInt(v, 10))
25+
.sort((a, b) => b - a) // sort in descending order
26+
.find((v) => osVersionMaj >= v)
27+
28+
return satisfyingVersion === undefined ? "" : DefaultLinuxVersion[name][satisfyingVersion]
2729
}
2830

2931
export function isDefault(version: string | undefined, name: string) {

0 commit comments

Comments
 (0)