Skip to content

Commit ab03db7

Browse files
authored
Merge pull request #127 from aminya/update
2 parents 6a67820 + db461e4 commit ab03db7

File tree

5 files changed

+18
-13
lines changed

5 files changed

+18
-13
lines changed

dev/docker/arch_node.dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ COPY "./dist/" "/"
1515
WORKDIR "/"
1616

1717
# run installation
18-
RUN node ./setup_cpp.js --compiler llvm --cmake true --ninja true --cppcheck true --ccache true --vcpkg true --doxygen true --gcovr true --task true
18+
RUN node ./setup_cpp.js --compiler llvm --cmake true --ninja true --ccache true --vcpkg true --doxygen true --gcovr true --task true
19+
20+
# TODO fails!
21+
# --cppcheck true
1922

2023
# clean up
2124
RUN pacman -Scc --noconfirm

dist/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/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/__tests__/main.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ describe("getVersion", () => {
3939
it("gcovr", () => {
4040
expect(getVersion("gcovr", "5.0")).toBe("5.0")
4141
if (process.platform === "linux") {
42-
expect(getVersion("gcovr", "true", [20, 4])).toBe("5.1")
42+
expect(getVersion("gcovr", "true", [22, 4])).toBe("5.2")
43+
expect(getVersion("gcovr", "true", [20, 4])).toBe("5.2")
4344
expect(getVersion("gcovr", "true", [18, 4])).toBe("5.0")
4445
}
4546
})

src/default_versions.ts

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ const DefaultVersions: Record<string, string> = {
88
llvm: "13.0.0", // https://github.com/llvm/llvm-project/releases
99
clangtidy: "13.0.0",
1010
clangformat: "13.0.0",
11-
ninja: "1.11.0", // https://github.com/ninja-build/ninja/releases
12-
cmake: "3.23.2", // https://github.com/Kitware/CMake/releases
13-
gcovr: "5.1", // https://pypi.org/project/gcovr/
14-
conan: "1.50.0", // https://github.com/conan-io/conan/releases
15-
meson: "0.63.0", // https://github.com/mesonbuild/meson/releases
11+
ninja: "1.11.1", // https://github.com/ninja-build/ninja/releases
12+
cmake: "3.24.2", // https://github.com/Kitware/CMake/releases
13+
gcovr: "5.2", // https://pypi.org/project/gcovr/
14+
conan: "1.53.0", // https://github.com/conan-io/conan/releases
15+
meson: "0.63.3", // https://github.com/mesonbuild/meson/releases
1616
kcov: "40", // https://github.com/SimonKagstrom/kcov/releases
17-
task: "3.14.0", // https://github.com/go-task/task/releases
18-
doxygen: isArch() ? "1.9.3-1" : "1.9.4", // https://www.doxygen.nl/download.html // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=doxygen // https://formulae.brew.sh/formula/doxygen // https://archlinux.org/packages/extra/x86_64/doxygen/
17+
task: "3.16.0", // https://github.com/go-task/task/releases
18+
doxygen: isArch() ? "1.9.3-1" : "1.9.5", // https://www.doxygen.nl/download.html // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=doxygen // https://formulae.brew.sh/formula/doxygen // https://archlinux.org/packages/extra/x86_64/doxygen/
1919
gcc: "11", // https://github.com/brechtsanders/winlibs_mingw/releases and // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=gcc
2020
}
2121

@@ -45,11 +45,12 @@ const DefaultUbuntuVersion: Record<string, Record<number, string>> = {
4545
14: "13.0.0-ubuntu-16.04",
4646
},
4747
gcovr: {
48-
20: "5.1",
48+
22: "5.2",
49+
20: "5.2",
4950
18: "5.0",
5051
},
5152
meson: {
52-
20: "0.63.0",
53+
20: "0.63.3",
5354
18: "0.61.4",
5455
},
5556
nala: {

0 commit comments

Comments
 (0)