Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ jobs:
ubuntu-version: 22.04
- platform: ubuntu-24.04
ubuntu-version: 24.04
- platform: ubuntu-26.04
ubuntu-version: 26.04

runs-on: ${{ matrix.runner.platform }}

Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,18 @@ jobs:
- architecture: amd64
platform: ubuntu-24.04
ubuntu-version: 24.04
- architecture: amd64
platform: ubuntu-26.04
ubuntu-version: 26.04
- architecture: arm64
platform: codspeedhq-arm64-ubuntu-22.04
platform: ubuntu-22.04-arm
ubuntu-version: 22.04
- architecture: arm64
platform: codspeedhq-arm64-ubuntu-24.04
platform: ubuntu-24.04-arm
ubuntu-version: 24.04
- architecture: arm64
platform: ubuntu-26.04-arm
Comment thread
lvaroqui marked this conversation as resolved.
ubuntu-version: 26.04

runs-on: ${{ matrix.runner.platform }}
steps:
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2583,3 +2583,6 @@ test-suite.log

# python bytecode cache left behind when something imports generate_config.py as a module
/bench/__pycache__/

# Packages built by `just docker-deb`
/dist/
12 changes: 12 additions & 0 deletions Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,15 @@ install version:
cd "/tmp/valgrind-build/valgrind-{{ version }}"
sudo make install

# Builds the .deb for an Ubuntu release in Docker with docker/deb.Dockerfile, like the release
# workflow but unsigned, then installs it and runs Callgrind on it. The package lands in dist/
# under its release asset name. Builds the tracked files of the working tree, local changes
# included.
# Usage: just docker-deb 26.04
docker-deb ubuntu_version:
#!/usr/bin/env bash
set -euo pipefail
git submodule update --init --recursive
git ls-files -z --recurse-submodules | tar --null -T - -cf - |
Comment thread
lvaroqui marked this conversation as resolved.
docker build -f docker/deb.Dockerfile --build-arg UBUNTU_VERSION="{{ ubuntu_version }}" \
--output type=local,dest=dist -
28 changes: 28 additions & 0 deletions docker/deb.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Builds the .deb for an Ubuntu release like the release workflow, but unsigned, then installs
# it and runs Callgrind on it. The final stage holds only the package, named as its release
# asset, for `docker build --output`.
ARG UBUNTU_VERSION=24.04

FROM ubuntu:${UBUNTU_VERSION} AS build
ARG UBUNTU_VERSION
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update -q \
&& apt-get install -y -q build-essential devscripts debhelper dh-make \
&& apt-get install -y -q debhelper-compat gdb mpi-default-dev pkgconf docbook docbook-xsl \
docbook-xml xsltproc

WORKDIR /build/src
COPY . .
RUN debuild --no-tgz-check -nc -us -uc >/build/debuild.log 2>&1 \
|| { tail -n 50 /build/debuild.log; exit 1; }

RUN deb=$(ls /build/valgrind_*.deb) \
&& version=$(dpkg-deb -f "$deb" Version) \
&& mkdir /out \
&& cp "$deb" "/out/valgrind_${version#*:}_ubuntu-${UBUNTU_VERSION}_$(dpkg-deb -f "$deb" Architecture).deb"
RUN apt-get install -y -q /out/*.deb \
&& valgrind --version \
&& valgrind --tool=callgrind --cycle-estimation=yes --callgrind-out-file=/dev/null /bin/true

FROM scratch
COPY --from=build /out/ /
Loading