Skip to content

Commit

Permalink
Dockerimage updated to ubuntu:20.04
Browse files Browse the repository at this point in the history
- Ubuntu:18.04 has issues with c++17 and nlohmann_json (nlohmann/json#3090)
- Added dos2unix to fix  DOS line endings  to enable building in Windows
- Added CodeQL analysis
  • Loading branch information
SivaKesava1 committed Nov 11, 2021
1 parent bce6661 commit 995b1bb
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 75 deletions.
70 changes: 0 additions & 70 deletions .github/workflows/codeql-analysis.yml

This file was deleted.

8 changes: 8 additions & 0 deletions .github/workflows/dockerimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ jobs:
- name: Setup the environment
run: |-
bash setup.sh
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: cpp, python

- name: Build and test groot
run: |-
Expand All @@ -29,6 +34,9 @@ jobs:
cp -r ../test/TestFiles/ test/
ctest --output-on-failure --extra-verbose
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1

- name: Generate coverage file
run: |-
cd build
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM ubuntu:18.04
FROM ubuntu:20.04

LABEL maintainer="[email protected]"

ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update && \
apt-get install sudo
apt-get install sudo dos2unix

ENV HOME /home/groot
ENV INSIDE_DOCKER="yes"
Expand All @@ -18,6 +18,7 @@ USER groot
WORKDIR $HOME

COPY setup.sh setup.sh
RUN sudo dos2unix setup.sh
RUN bash setup.sh

WORKDIR $HOME/groot
Expand Down
7 changes: 4 additions & 3 deletions setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@ export DEBIAN_FRONTEND=noninteractive

sudo apt-get update
[[ "$INSIDE_DOCKER" == "yes" ]] && sudo apt-get upgrade -yq
sudo apt-get install -yq apt-utils\
sudo DEBIAN_FRONTEND="noninteractive" apt-get install -yq apt-utils\
binutils \
cmake curl \
g++ git \
libboost-all-dev \
patch \
sudo \
pkg-config \
tar time \
unzip
unzip \
zip

sudo apt-get autoremove -y --purge

Expand Down

0 comments on commit 995b1bb

Please sign in to comment.