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: container improvements #6490

Merged
merged 8 commits into from
Dec 17, 2024
+125 −102
Merged

ci: container improvements #6490

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
440fd3f
ci: drop distro LLVM packages, move Clang install up, set defaults
kwvg Dec 15, 2024
64cdc42
ci: add LLVM library path to `LD_LIBRARY_PATH` and GDB allowlist
kwvg Dec 15, 2024
b7099ee
ci: remove redundant `version` attribute, avoid `lldb` personality error
kwvg Dec 15, 2024
e770229
ci: purge package manager cache after each interaction
kwvg Nov 16, 2024
eef8635
ci: install `i386` packages only if host is `amd64`, merge layers
kwvg Nov 16, 2024
187fe17
ci: don't stage packages in `/tmp`, reduce layers for `cppcheck` build
kwvg Nov 8, 2024
8dd0db7
ci: fix "LC_ALL: cannot change locale (en_US.UTF-8)" in Guix container
kwvg Nov 22, 2024
04ce1fe
ci: deduplicate macOS SDK setup logic
kwvg Dec 16, 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
Prev Previous commit
Next Next commit
ci: install i386 packages only if host is amd64, merge layers
  • Loading branch information
@kwvg
kwvg committed Dec 15, 2024
commit eef863554a1e9011dafdf21a4b5c78ac7c879e6c
18 changes: 11 additions & 7 deletions contrib/containers/ci/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,17 @@ ENV DEBIAN_FRONTEND="noninteractive" TZ="Europe/London"
# (zlib1g-dev is needed for the Qt host binary builds, but should not be used by target binaries)
ENV APT_ARGS="-y --no-install-recommends --no-upgrade"

# Install packages for i386; disabled on aarch64 and arm64 hosts
RUN (dpkg --print-architecture | grep -Eq 'aarch64|arm64' || dpkg --add-architecture i386)
RUN (dpkg --print-architecture | grep -Eq 'aarch64|arm64' || (apt-get update && apt-get install $APT_ARGS \
g++-multilib \
wine32) && rm -rf /var/lib/apt/lists/*)

RUN apt-get update && apt-get install $APT_ARGS \
# Install packages for i386 on amd64 hosts, then install common packages
RUN set -ex; \
apt-get update && \
if [ "$(dpkg --print-architecture)" = "amd64" ]; then \
dpkg --add-architecture i386 && \
apt-get update && \
apt-get install $APT_ARGS \
g++-multilib \
wine32; \
fi; \
apt-get install $APT_ARGS \
autotools-dev \
automake \
autoconf \
Expand Down