From 4f16b1893d42aebacc81776b8f3571e1034e87f0 Mon Sep 17 00:00:00 2001
From: Hynek Schlawack <hs@ox.cx>
Date: Sun, 26 May 2024 19:44:57 +0200
Subject: [PATCH] Add support for ubuntu-24.04

---
 .github/workflows/ci.yml | 11 +++++++++--
 CHANGELOG.md             |  5 +++++
 action.yml               |  4 ++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 72a8c6e..95aa644 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,7 +36,14 @@ jobs:
 
   check-structlog:
     name: Build & verify the structlog package.
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-20.04
+          - ubuntu-22.04
+          - ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v4
@@ -52,7 +59,7 @@ jobs:
         id: baipp
         with:
           path: structlog
-          upload-name-suffix: "-structlog"
+          upload-name-suffix: "-structlog-${{ matrix.os }}"
 
       - run: echo Packages can be found at ${{ steps.baipp.outputs.dist }}
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2134f92..5639d2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased](https://github.com/hynek/build-and-inspect-python-package/compare/v2.5.0...main)
 
+### Added
+
+- Support for `ubuntu-24.04` builders.
+  [#126](https://github.com/hynek/build-and-inspect-python-package/pull/126)
+
 
 ## [2.5.0](https://github.com/hynek/build-and-inspect-python-package/compare/v2.4.0...v2.5.0) - 2024-05-13
 
diff --git a/action.yml b/action.yml
index d0b87fe..d9af706 100644
--- a/action.yml
+++ b/action.yml
@@ -153,6 +153,10 @@ runs:
         mkdir -p out/sdist
         tar xf *.tar.gz -C out/sdist
 
+        if ! command -v tree &> /dev/null; then
+            apt-get install tree
+        fi
+
         echo -e '\n<details><summary>SDist contents</summary>\n' >> $GITHUB_STEP_SUMMARY
         (cd /tmp/baipp/dist/out/sdist && tree -Da --timefmt="%Y-%m-%dT%H:%M:%SZ" * | sed 's/^/    /' | tee -a $GITHUB_STEP_SUMMARY)
         echo -e '\n</details>\n' >> $GITHUB_STEP_SUMMARY