Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI Updates #440

Merged
merged 3 commits into from
Dec 13, 2024
Merged

CI Updates #440

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
289f808
CI: Require newer gcc and python on opensuse-leap builds
timwoj Dec 13, 2024
6bb14a1
CI: Add python3-distuils to ubuntu 20 image
timwoj Dec 13, 2024
c7ab658
CI: Add '=' to ENV commands to silence 'docker build' warnings
timwoj Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions ci/opensuse-leap-15.5/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,21 @@ FROM opensuse/leap:15.5

# A version field to invalidate Cirrus's build cache when needed, as suggested in
# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
ENV DOCKERFILE_VERSION 20230612
ENV DOCKERFILE_VERSION=20230612

RUN zypper in -y \
cmake \
gcc \
gcc-c++ \
gcc12 \
gcc12-c++ \
git \
libopenssl-devel \
make \
python3 \
python3-devel \
python311 \
python311-devel \
&& rm -rf /var/cache/zypp

RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.11 100
RUN update-alternatives --install /usr/bin/python3-config python3-config /usr/bin/python3.11-config 100

RUN update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-12 100
RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-12 100
16 changes: 11 additions & 5 deletions ci/opensuse-leap-15.6/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,21 @@ FROM opensuse/leap:15.6

# A version field to invalidate Cirrus's build cache when needed, as suggested in
# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
ENV DOCKERFILE_VERSION 20240524
ENV DOCKERFILE_VERSION=20240524

RUN zypper in -y \
cmake \
gcc \
gcc-c++ \
gcc12 \
gcc12-c++ \
git \
libopenssl-devel \
make \
python3 \
python3-devel \
python312 \
python312-devel \
&& rm -rf /var/cache/zypp

RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.12 100
RUN update-alternatives --install /usr/bin/python3-config python3-config /usr/bin/python3.12-config 100

RUN update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-12 100
RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-12 100
3 changes: 2 additions & 1 deletion ci/ubuntu-20.04/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"

# A version field to invalidate Cirrus's build cache when needed, as suggested in
# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
ENV DOCKERFILE_VERSION 20220519
ENV DOCKERFILE_VERSION=20220519

RUN apt-get update && apt-get -y install \
cmake \
Expand All @@ -14,5 +14,6 @@ RUN apt-get update && apt-get -y install \
make \
python3.9 \
python3.9-dev \
python3-distutils \
&& apt autoclean \
&& rm -rf /var/lib/apt/lists/*
Loading