From 9833f067a07f6d71027a41cb7659b967d0d8a945 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Mon, 11 Sep 2023 13:50:40 -0700 Subject: [PATCH 1/2] docs: add docerk file for ubuntu 20.04 --- dev/docker/setup-cpp-ubuntu-20.0.4.dockerfile | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 dev/docker/setup-cpp-ubuntu-20.0.4.dockerfile diff --git a/dev/docker/setup-cpp-ubuntu-20.0.4.dockerfile b/dev/docker/setup-cpp-ubuntu-20.0.4.dockerfile new file mode 100644 index 00000000..da8296d8 --- /dev/null +++ b/dev/docker/setup-cpp-ubuntu-20.0.4.dockerfile @@ -0,0 +1,38 @@ +#### Base Image +FROM ubuntu:20.04 as setup-cpp-ubuntu-mingw + +RUN apt-get update -qq && \ + # install latest nodejs on ubuntu 20.04 + apt-get update -qq && \ + apt-get install -y --no-install-recommends curl gnupg ca-certificates && \ + mkdir -p /etc/apt/keyrings && \ + curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \ + echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \ + apt-get update -qq && \ + apt-get install -y --no-install-recommends nodejs && \ + # install setup-cpp + npm install -g setup-cpp@v0.35.6 && \ + # install the compiler and tools + setup-cpp \ + --nala true \ + --compiler mingw \ + --cmake true \ + --ninja true \ + --task true \ + --vcpkg true \ + --python true \ + --make true \ + --cppcheck true \ + --gcovr true \ + --doxygen true \ + --ccache true \ + --powershell true && \ + # cleanup + nala autoremove -y && \ + nala autopurge -y && \ + apt-get clean && \ + nala clean --lists && \ + rm -rf /var/lib/apt/lists/* && \ + rm -rf /tmp/* + +ENTRYPOINT ["/bin/bash"] From 20bb9d646a079b61f937780f10a6616d184557e4 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Mon, 11 Sep 2023 13:52:27 -0700 Subject: [PATCH 2/2] docs: use npm in setup-cpp for GitLab [skip ci] --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 282ff892..be3856d6 100644 --- a/README.md +++ b/README.md @@ -263,14 +263,14 @@ stages: apt-get update -qq apt-get install -y --no-install-recommends curl gnupg ca-certificates - # keys used by apt - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 40976EAF437D05B5 - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1E9377A2BA9EF27F - .setup-cpp: &setup-cpp | - curl -LJO "https://github.com/aminya/setup-cpp/releases/download/v0.35.6/setup-cpp-x64-linux" - chmod +x setup-cpp-x64-linux + # install nodejs + apt-get install -y --no-install-recommends nodejs npm + + # install setup-cpp + npm install -g setup-cpp@v0.35.6 + + # install the compiler and tools ./setup-cpp-x64-linux --compiler $compiler --cmake true --ninja true --ccache true --vcpkg true source ~/.cpprc