Skip to content

Commit e9ad632

Browse files
authored
Merge pull request #80 from aminya/gcovr [skip ci]
2 parents 75619ca + 0188a5a commit e9ad632

File tree

7 files changed

+16
-16
lines changed

7 files changed

+16
-16
lines changed

dev/docker/ubuntu.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN wget --no-verbose "https://github.com/aminya/setup-cpp/releases/download/v0.
99
RUN chmod +x ./setup_cpp_linux
1010

1111
# install llvm, cmake, ninja, and ccache
12-
RUN ./setup_cpp_linux --compiler llvm --cmake true --ninja true --ccache true --vcpkg true --make true
12+
RUN ./setup_cpp_linux --compiler llvm --cmake true --ninja true --ccache true --vcpkg true --task true
1313

1414
CMD source ~/.cpprc
1515
ENTRYPOINT [ "/bin/bash" ]
@@ -19,7 +19,7 @@ FROM base AS builder
1919
ADD ./dev/cpp_vcpkg_project /home/app
2020
WORKDIR /home/app
2121
RUN bash -c 'source ~/.cpprc \
22-
&& make build'
22+
&& task build'
2323

2424
### Running environment
2525
# use a distroless image or ubuntu:22.04 if you wish

dev/docker/ubuntu_20.04_node.dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
88
ENV DEBIAN_FRONTEND=noninteractive
99
RUN apt-get update -qq
1010
RUN apt-get install -y --no-install-recommends curl gnupg ca-certificates
11-
RUN curl -fsSL https://deb.nodesource.com/setup_lts.x | bash -
11+
RUN curl -fsSL https://deb.nodesource.com/setup_lts.x | bash -
1212
RUN apt-get install -y --no-install-recommends nodejs
1313

1414
# add setup_cpp.js
1515
ADD "./dist/" "/"
1616
WORKDIR "/"
1717

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

2121
CMD source ~/.cpprc
2222
ENTRYPOINT [ "/bin/bash" ]
@@ -25,8 +25,8 @@ ENTRYPOINT [ "/bin/bash" ]
2525
FROM base AS builder
2626
ADD ./dev/cpp_vcpkg_project /home/app
2727
WORKDIR /home/app
28-
RUN bash -c 'source ~/.cpprc \
29-
&& make build'
28+
RUN bash -c 'source ~/.cpprc \
29+
&& task build'
3030

3131
### Running environment
3232
# use a distroless image or ubuntu:20.04 if you wish

dev/docker/ubuntu_node.dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ADD "./dist/" "/"
88
WORKDIR "/"
99

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

1313
CMD source ~/.cpprc
1414
ENTRYPOINT [ "/bin/bash" ]
@@ -17,8 +17,8 @@ ENTRYPOINT [ "/bin/bash" ]
1717
FROM base AS builder
1818
ADD ./dev/cpp_vcpkg_project /home/app
1919
WORKDIR /home/app
20-
RUN bash -c 'source ~/.cpprc \
21-
&& make build'
20+
RUN bash -c 'source ~/.cpprc \
21+
&& task build'
2222

2323
### Running environment
2424
# use a distroless image or ubuntu:22.04 if you wish

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/default_versions.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ const DefaultVersions: Record<string, string> = {
66
clangformat: "13.0.0",
77
ninja: "1.10.2", // https://github.com/ninja-build/ninja/releases
88
cmake: "3.23.1", // https://github.com/Kitware/CMake/releases
9-
gcovr: "5.0", // https://pypi.org/project/gcovr/
10-
conan: "1.47.0", // https://github.com/conan-io/conan/releases
11-
meson: "0.61.4", // https://github.com/mesonbuild/meson/releases
9+
gcovr: "5.1", // https://pypi.org/project/gcovr/
10+
conan: "1.48.0", // https://github.com/conan-io/conan/releases
11+
meson: "0.62.1", // https://github.com/mesonbuild/meson/releases
1212
python: "3.8.10",
1313
kcov: "40", // https://github.com/SimonKagstrom/kcov/releases
14-
task: "3.12.0", // https://github.com/go-task/task/releases
14+
task: "3.12.1", // https://github.com/go-task/task/releases
1515
doxygen: process.platform === "darwin" ? "1.9.3" : "1.9.4", // https://www.doxygen.nl/download.html // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=doxygen
1616
gcc: process.platform === "win32" ? "11.2.0.07112021" : "11", // https://community.chocolatey.org/packages/mingw#versionhistory and // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=gcc
1717
}

0 commit comments

Comments
 (0)