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

infra: parent_image=ubuntu:24.04 #13018

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+8 −5
Open

infra: parent_image=ubuntu:24.04 #13018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d35436
infra: Remove unused python3-distutils in llvm
maflcko Feb 7, 2025
e65fc73
infra: Remove python2.7 for swift
maflcko Feb 7, 2025
c6c5ab9
infra: parent_image=ubuntu:24.04
maflcko Feb 7, 2025
0d3e1c5
Merge branch 'master' into 2502-ubuntu-24-04
maflcko Feb 7, 2025
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
1 change: 0 additions & 1 deletion infra/base-images/base-builder/install_swift.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ SWIFT_PACKAGES="wget \
libcurl4 \
libedit2 \
libgcc-9-dev \
libpython2.7 \
libsqlite3-0 \
libstdc++-9-dev \
libxml2 \
Expand Down
5 changes: 4 additions & 1 deletion infra/base-images/base-builder/precompile_honggfuzz
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ make clean
# These CFLAGs match honggfuzz's default, with the exception of -mtune to
# improve portability and `-D_HF_LINUX_NO_BFD` to remove assembly instructions
# from the filenames.
CC=clang CFLAGS="-O3 -funroll-loops -D_HF_LINUX_NO_BFD" make
#
# The LDFLAGS disable pie to work around a linker error that happens after a
# base-image bump from ubuntu:20.04.
CC=clang LDFLAGS="-no-pie" CFLAGS="-O3 -funroll-loops -D_HF_LINUX_NO_BFD" make

# libhfuzz.a will be added by CC/CXX linker directly during linking,
# but it's defined here to satisfy the build infrastructure
Expand Down
2 changes: 1 addition & 1 deletion infra/base-images/base-clang/checkout_build_install_llvm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ esac

INTROSPECTOR_DEP_PACKAGES="texinfo bison flex"
# zlib1g-dev is needed for llvm-profdata to handle coverage data from rust compiler
LLVM_DEP_PACKAGES="build-essential make ninja-build git python3 python3-distutils binutils-dev zlib1g-dev $ARCHITECTURE_DEPS $INTROSPECTOR_DEP_PACKAGES"
LLVM_DEP_PACKAGES="build-essential make ninja-build git python3 binutils-dev zlib1g-dev $ARCHITECTURE_DEPS $INTROSPECTOR_DEP_PACKAGES"

apt-get update && apt-get install -y $LLVM_DEP_PACKAGES --no-install-recommends

Expand Down
3 changes: 2 additions & 1 deletion infra/base-images/base-image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@

# Base image for all other images.

ARG parent_image=ubuntu:20.04@sha256:4a45212e9518f35983a976eead0de5eecc555a2f047134e9dd2cfc589076a00d
# Pin to a hash to keep stable and re-usable caches
ARG parent_image=ubuntu:24.04@sha256:72297848456d5d37d1262630108ab308d3e9ec7ed1c3286a32fe09856619a782

FROM $parent_image

Expand Down
2 changes: 1 addition & 1 deletion infra/base-images/base-runner/install_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ apt-get update && apt-get install -y \
case $(uname -m) in
x86_64)
# We only need to worry about i386 if we are on x86_64.
apt-get install -y lib32gcc1 libc6-i386
apt-get install -y lib32gcc-s1 libc6-i386
;;
esac
Loading