Skip to content

Commit e486e36

Browse files
authored
Merge pull request #264 from aminya/powershell-ubuntu-24 [skip ci]
2 parents 35ec48a + c2afe42 commit e486e36

File tree

17 files changed

+322
-151
lines changed

17 files changed

+322
-151
lines changed

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
- windows-2022
8585
- ubuntu-24.04
8686
- macos-13
87-
- macos-12
87+
# - macos-12
8888
node:
8989
- 22
9090
pnpm:

dist/actions/setup-cpp.js

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

dist/actions/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/legacy/setup-cpp.js

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

dist/legacy/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/modern/setup-cpp.js

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

dist/modern/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/cmake/cmake.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { addExeExt } from "patha"
22
import semverCoerce from "semver/functions/coerce"
33
import semverLte from "semver/functions/lte"
4-
import { extractTarByExe, extractZip } from "../utils/setup/extract.js"
54
import { type InstallationInfo, type PackageInfo, setupBin } from "../utils/setup/setupBin.js"
65

76
/** Get the platform data for cmake */
@@ -21,7 +20,6 @@ function getCmakePackageInfo(version: string, platform: NodeJS.Platform, arch: s
2120
binRelativeDir: "bin/",
2221
binFileName: addExeExt("cmake"),
2322
extractedFolderName: folderName,
24-
extractFunction: extractZip,
2523
url: `https://github.com/Kitware/CMake/releases/download/v${version}/${folderName}.zip`,
2624
}
2725
}
@@ -33,7 +31,6 @@ function getCmakePackageInfo(version: string, platform: NodeJS.Platform, arch: s
3331
binRelativeDir: "CMake.app/Contents/bin/",
3432
binFileName: addExeExt("cmake"),
3533
extractedFolderName: folderName,
36-
extractFunction: extractTarByExe,
3734
url: `https://github.com/Kitware/CMake/releases/download/v${version}/${folderName}.tar.gz`,
3835
}
3936
}
@@ -50,7 +47,6 @@ function getCmakePackageInfo(version: string, platform: NodeJS.Platform, arch: s
5047
binRelativeDir: "bin/",
5148
binFileName: addExeExt("cmake"),
5249
extractedFolderName: folderName,
53-
extractFunction: extractTarByExe,
5450
url: `https://github.com/Kitware/CMake/releases/download/v${version}/${folderName}.tar.gz`,
5551
}
5652
}

src/doxygen/doxygen.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { addPath } from "envosman"
33
import { addExeExt, join } from "patha"
44
import { installAptPack } from "setup-apt"
55
import { setupGraphviz } from "../graphviz/graphviz.js"
6-
import { extractTar, extractZip } from "../utils/setup/extract.js"
76
import { type InstallationInfo, type PackageInfo, setupBin } from "../utils/setup/setupBin.js"
87
import { setupBrewPack } from "../utils/setup/setupBrewPack.js"
98
import { setupChocoPack } from "../utils/setup/setupChocoPack.js"
@@ -31,7 +30,6 @@ function getDoxygenPackageInfo(version: string, platform: NodeJS.Platform, _arch
3130
binRelativeDir: "bin/",
3231
binFileName: addExeExt("doxygen"),
3332
extractedFolderName: folderName,
34-
extractFunction: extractTar,
3533
url: `https://www.doxygen.nl/files/${folderName}.linux.bin.tar.gz`,
3634
}
3735
}
@@ -41,7 +39,6 @@ function getDoxygenPackageInfo(version: string, platform: NodeJS.Platform, _arch
4139
binRelativeDir: "",
4240
binFileName: addExeExt("doxygen"),
4341
extractedFolderName: folderName,
44-
extractFunction: extractZip,
4542
url: `https://www.doxygen.nl/files/${folderName}.windows.x64.bin.zip`,
4643
}
4744
}

src/kcov/kcov.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ function getDownloadKcovPackageInfo(version: string): PackageInfo {
2323
extractedFolderName: "",
2424
binRelativeDir: "usr/local/bin",
2525
binFileName: addExeExt("kcov"),
26-
extractFunction: extractTarByExe,
2726
}
2827
}
2928

0 commit comments

Comments
 (0)