Skip to content

Commit

Permalink
Merge branch 'master' into codechecker
Browse files Browse the repository at this point in the history
  • Loading branch information
Yaraslaut authored Jul 17, 2023
2 parents 3333140 + 5fc7bab commit faaccef
Show file tree
Hide file tree
Showing 127 changed files with 3,647 additions and 2,042 deletions.
2 changes: 1 addition & 1 deletion .github/archlinux/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM archlinux/archlinux:base-devel
FROM archlinux:base-devel

WORKDIR /app

Expand Down
4 changes: 2 additions & 2 deletions .github/fedora/contour.spec
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ for everyday use. It is aiming for power users with a modern feature mindset.
cmake . \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCONTOUR_BUILD_WITH_QT6=ON \
-DCONTOUR_QT_VERSION=6 \
-DPEDANTIC_COMPILER=ON \
-DPEDANTIC_COMPILER_WERROR=ON \
-B build \
Expand All @@ -75,7 +75,7 @@ cd build

%files
%license LICENSE.txt
%doc README.md CONTRIBUTING.md TODO.md
%doc README.md docs/CONTRIBUTING.md TODO.md
%{_bindir}/*
%{_datadir}/*

Expand Down
39 changes: 39 additions & 0 deletions .github/ubuntu18/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
FROM ubuntu:18.04

# Install updates to base image
RUN \
apt-get update \
&& apt-get install -y \
git \
wget \
sudo \
ninja-build \
software-properties-common

RUN add-apt-repository ppa:ubuntu-toolchain-r/test
RUN apt-get update
RUN apt-get install -y g++-10

RUN apt-get purge -y --auto-remove cmake
RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
RUN apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main'
RUN apt-get install -y cmake

WORKDIR /home/docker

RUN git clone --depth=1 https://github.com/contour-terminal/contour.git
WORKDIR /home/docker/contour
RUN SYSDEP_ASSUME_YES=ON ./scripts/install-deps.sh
RUN cmake --version
RUN g++-10 --version
RUN cmake -S . -B build -G Ninja \
-D CMAKE_CXX_STANDARD=20 \
-D CMAKE_CXX_COMPILER=g++-10

RUN cmake --build build -- -j3
RUN ./build/src/crispy/crispy_test
RUN ./build/src/vtparser/vtparser_test
RUN ./build/src/vtbackend/vtbackend_test
RUN cd build && cpack -G DEB -V .
RUN mv build/*.deb package.deb
RUN mv build/*.ddeb package.ddeb
Loading

0 comments on commit faaccef

Please sign in to comment.