Skip to content

Commit

Permalink
fix: update ninja, cmake, gcovr, conan, meson, task, doxygen
Browse files Browse the repository at this point in the history
  • Loading branch information
aminya committed Oct 7, 2022
1 parent 6a67820 commit db461e4
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 13 deletions.
5 changes: 4 additions & 1 deletion dev/docker/arch_node.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ COPY "./dist/" "/"
WORKDIR "/"

# run installation
RUN node ./setup_cpp.js --compiler llvm --cmake true --ninja true --cppcheck true --ccache true --vcpkg true --doxygen true --gcovr true --task true
RUN node ./setup_cpp.js --compiler llvm --cmake true --ninja true --ccache true --vcpkg true --doxygen true --gcovr true --task true

# TODO fails!
# --cppcheck true

# clean up
RUN pacman -Scc --noconfirm
Expand Down
2 changes: 1 addition & 1 deletion dist/setup_cpp.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/setup_cpp.js.map

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion src/__tests__/main.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ describe("getVersion", () => {
it("gcovr", () => {
expect(getVersion("gcovr", "5.0")).toBe("5.0")
if (process.platform === "linux") {
expect(getVersion("gcovr", "true", [20, 4])).toBe("5.1")
expect(getVersion("gcovr", "true", [22, 4])).toBe("5.2")
expect(getVersion("gcovr", "true", [20, 4])).toBe("5.2")
expect(getVersion("gcovr", "true", [18, 4])).toBe("5.0")
}
})
Expand Down
19 changes: 10 additions & 9 deletions src/default_versions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ const DefaultVersions: Record<string, string> = {
llvm: "13.0.0", // https://github.com/llvm/llvm-project/releases
clangtidy: "13.0.0",
clangformat: "13.0.0",
ninja: "1.11.0", // https://github.com/ninja-build/ninja/releases
cmake: "3.23.2", // https://github.com/Kitware/CMake/releases
gcovr: "5.1", // https://pypi.org/project/gcovr/
conan: "1.50.0", // https://github.com/conan-io/conan/releases
meson: "0.63.0", // https://github.com/mesonbuild/meson/releases
ninja: "1.11.1", // https://github.com/ninja-build/ninja/releases
cmake: "3.24.2", // https://github.com/Kitware/CMake/releases
gcovr: "5.2", // https://pypi.org/project/gcovr/
conan: "1.53.0", // https://github.com/conan-io/conan/releases
meson: "0.63.3", // https://github.com/mesonbuild/meson/releases
kcov: "40", // https://github.com/SimonKagstrom/kcov/releases
task: "3.14.0", // https://github.com/go-task/task/releases
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/
task: "3.16.0", // https://github.com/go-task/task/releases
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/
gcc: "11", // https://github.com/brechtsanders/winlibs_mingw/releases and // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=gcc
}

Expand Down Expand Up @@ -45,11 +45,12 @@ const DefaultUbuntuVersion: Record<string, Record<number, string>> = {
14: "13.0.0-ubuntu-16.04",
},
gcovr: {
20: "5.1",
22: "5.2",
20: "5.2",
18: "5.0",
},
meson: {
20: "0.63.0",
20: "0.63.3",
18: "0.61.4",
},
nala: {
Expand Down

0 comments on commit db461e4

Please sign in to comment.