Merge pull request #80 from aminya/gcovr [skip ci]

This commit is contained in:
Amin Yahyaabadi 2022-05-15 04:34:59 -07:00 committed by GitHub
commit e9ad632584
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 16 additions and 16 deletions

@ -1 +1 @@
Subproject commit f4fe216401a8eac95d66969f0ee2b760b3c4edf0 Subproject commit 8775a79c3af6d7efe193ff26afadb45bd74ed894

View File

@ -9,7 +9,7 @@ RUN wget --no-verbose "https://github.com/aminya/setup-cpp/releases/download/v0.
RUN chmod +x ./setup_cpp_linux RUN chmod +x ./setup_cpp_linux
# install llvm, cmake, ninja, and ccache # install llvm, cmake, ninja, and ccache
RUN ./setup_cpp_linux --compiler llvm --cmake true --ninja true --ccache true --vcpkg true --make true RUN ./setup_cpp_linux --compiler llvm --cmake true --ninja true --ccache true --vcpkg true --task true
CMD source ~/.cpprc CMD source ~/.cpprc
ENTRYPOINT [ "/bin/bash" ] ENTRYPOINT [ "/bin/bash" ]
@ -19,7 +19,7 @@ FROM base AS builder
ADD ./dev/cpp_vcpkg_project /home/app ADD ./dev/cpp_vcpkg_project /home/app
WORKDIR /home/app WORKDIR /home/app
RUN bash -c 'source ~/.cpprc \ RUN bash -c 'source ~/.cpprc \
&& make build' && task build'
### Running environment ### Running environment
# use a distroless image or ubuntu:22.04 if you wish # use a distroless image or ubuntu:22.04 if you wish

View File

@ -8,7 +8,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update -qq RUN apt-get update -qq
RUN apt-get install -y --no-install-recommends curl gnupg ca-certificates RUN apt-get install -y --no-install-recommends curl gnupg ca-certificates
RUN curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - RUN curl -fsSL https://deb.nodesource.com/setup_lts.x | bash -
RUN apt-get install -y --no-install-recommends nodejs RUN apt-get install -y --no-install-recommends nodejs
# add setup_cpp.js # add setup_cpp.js
@ -16,7 +16,7 @@ ADD "./dist/" "/"
WORKDIR "/" WORKDIR "/"
# run installation # run installation
RUN node ./setup_cpp.js --compiler llvm --cmake true --ninja true --cppcheck true --ccache true --vcpkg true --doxygen true --gcovr true --make true RUN node ./setup_cpp.js --compiler llvm --cmake true --ninja true --cppcheck true --ccache true --vcpkg true --doxygen true --gcovr true --task true
CMD source ~/.cpprc CMD source ~/.cpprc
ENTRYPOINT [ "/bin/bash" ] ENTRYPOINT [ "/bin/bash" ]
@ -25,8 +25,8 @@ ENTRYPOINT [ "/bin/bash" ]
FROM base AS builder FROM base AS builder
ADD ./dev/cpp_vcpkg_project /home/app ADD ./dev/cpp_vcpkg_project /home/app
WORKDIR /home/app WORKDIR /home/app
RUN bash -c 'source ~/.cpprc \ RUN bash -c 'source ~/.cpprc \
&& make build' && task build'
### Running environment ### Running environment
# use a distroless image or ubuntu:20.04 if you wish # use a distroless image or ubuntu:20.04 if you wish

View File

@ -8,7 +8,7 @@ ADD "./dist/" "/"
WORKDIR "/" WORKDIR "/"
# run installation # run installation
RUN node ./setup_cpp.js --compiler llvm --cmake true --ninja true --cppcheck true --ccache true --vcpkg true --doxygen true --gcovr true --make true RUN node ./setup_cpp.js --compiler llvm --cmake true --ninja true --cppcheck true --ccache true --vcpkg true --doxygen true --gcovr true --task true
CMD source ~/.cpprc CMD source ~/.cpprc
ENTRYPOINT [ "/bin/bash" ] ENTRYPOINT [ "/bin/bash" ]
@ -17,8 +17,8 @@ ENTRYPOINT [ "/bin/bash" ]
FROM base AS builder FROM base AS builder
ADD ./dev/cpp_vcpkg_project /home/app ADD ./dev/cpp_vcpkg_project /home/app
WORKDIR /home/app WORKDIR /home/app
RUN bash -c 'source ~/.cpprc \ RUN bash -c 'source ~/.cpprc \
&& make build' && task build'
### Running environment ### Running environment
# use a distroless image or ubuntu:22.04 if you wish # use a distroless image or ubuntu:22.04 if you wish

2
dist/setup_cpp.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -6,12 +6,12 @@ const DefaultVersions: Record<string, string> = {
clangformat: "13.0.0", clangformat: "13.0.0",
ninja: "1.10.2", // https://github.com/ninja-build/ninja/releases ninja: "1.10.2", // https://github.com/ninja-build/ninja/releases
cmake: "3.23.1", // https://github.com/Kitware/CMake/releases cmake: "3.23.1", // https://github.com/Kitware/CMake/releases
gcovr: "5.0", // https://pypi.org/project/gcovr/ gcovr: "5.1", // https://pypi.org/project/gcovr/
conan: "1.47.0", // https://github.com/conan-io/conan/releases conan: "1.48.0", // https://github.com/conan-io/conan/releases
meson: "0.61.4", // https://github.com/mesonbuild/meson/releases meson: "0.62.1", // https://github.com/mesonbuild/meson/releases
python: "3.8.10", python: "3.8.10",
kcov: "40", // https://github.com/SimonKagstrom/kcov/releases kcov: "40", // https://github.com/SimonKagstrom/kcov/releases
task: "3.12.0", // https://github.com/go-task/task/releases task: "3.12.1", // https://github.com/go-task/task/releases
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 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
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 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
} }