Skip to content

Commit

Permalink
fix develop ci
Browse files Browse the repository at this point in the history
  • Loading branch information
TKussel committed Sep 4, 2024
1 parent 892f4be commit 3bb48fb
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ on:
push:
branches:
- 'master'
- 'develop'
- 'dev'
- 'feature/beamsel'
tags:
- 'v*.*.*'
pull_request:

jobs:
build:
runs-on: ubuntu-24.04
runs-on: ubuntu-22.04
strategy:
matrix:
include:
Expand Down
19 changes: 11 additions & 8 deletions Dockerfile.ubuntu
Original file line number Diff line number Diff line change
@@ -1,36 +1,38 @@
FROM ubuntu:rolling as build
FROM ubuntu:rolling AS build

# Backup libs so we know what to copy later to runtime image
RUN find /lib/x86_64-linux-gnu/ /usr/lib/x86_64-linux-gnu/ -name '*.so*' > /shared-libs.list

RUN apt-get update && \
apt-get install -y --no-install-recommends \
dpkg-dev \
g++-12 \
g++-10 \
libc6-dev \
python3-dev \
python3-distutils-extra \
libssl-dev \
openssl \
cmake \
libboost-dev \
libboost-system-dev \
libboost-thread-dev \
libgmp-dev \
python3 \
libpython3-dev \
python3-distutils-extra \
libcurl4-openssl-dev \
&& rm -rf /var/lib/apt/lists/*

# We only installed gcc-12 -> make default
RUN ln -s /usr/bin/gcc-12 /usr/bin/gcc \
&& ln -s /usr/bin/g++-12 /usr/bin/g++ \
&& ln -s /usr/bin/gcov-12 /usr/bin/gcov
# We only installed gcc-10 -> make default
RUN ln -s /usr/bin/gcc-10 /usr/bin/gcc \
&& ln -s /usr/bin/g++-10 /usr/bin/g++ \
&& ln -s /usr/bin/gcov-10 /usr/bin/gcov

WORKDIR /app
COPY extern extern
COPY cmake cmake
COPY include include
COPY test test
COPY scripts scripts
COPY pysel pysel
COPY CMakeLists.txt sepilinker.cpp ./

# build!
Expand Down Expand Up @@ -80,3 +82,4 @@ EXPOSE 1337-1344

USER sel:sel
ENTRYPOINT ["/app/sel"]

0 comments on commit 3bb48fb

Please sign in to comment.