Merge pull request #352 from AkihiroSuda/dev

CI: update deps

.github/workflows/main.yaml

@@ -2,18 +2,19 @@ name: Main
 on: [push, pull_request]
 jobs:
   test-main:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         libslirp_commit: [master, v4.9.0, v4.8.0, v4.1.0]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - run: docker build -t slirp4netns-tests --build-arg LIBSLIRP_COMMIT -f Dockerfile.tests .
       env:
         LIBSLIRP_COMMIT: ${{ matrix.libslirp_commit }}
+    - run: sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
     - run: docker run --rm --privileged slirp4netns-tests
   test-build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - run: DOCKER_BUILDKIT=1 docker build -f Dockerfile.buildtests .

.github/workflows/release.yaml

@@ -5,35 +5,32 @@ on:
 
 jobs:
   release:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
       with:
         # Reproduce the exact commit hash value
         fetch-depth: 0
         ref: ${{ github.event.pull_request.head.sha }}
     - run: echo "SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct)" >> $GITHUB_ENV
-    - uses: docker/setup-buildx-action@v2
-    - name: Cache var-cache-apt
-      uses: actions/cache@v3
+    - uses: docker/setup-buildx-action@v3
+    - name: Cache apt
+      id: cache
+      uses: actions/cache@v4
       with:
-        path: var-cache-apt
+        path: |
+          var-cache-apt
+          var-lib-apt
         key: var-cache-apt-${{ hashFiles('Dockerfile.artifact') }}
-    - name: Cache var-lib-apt
-      uses: actions/cache@v3
-      with:
-        path: var-lib-apt
-        key: var-lib-apt-${{ hashFiles('Dockerfile.artifact') }}
     - name: inject var-cache-apt into docker
-      uses: reproducible-containers/[email protected]
-      with:
-        cache-source: var-cache-apt
-        cache-target: /var/cache/apt
-    - name: inject var-lib-apt into docker
-      uses: reproducible-containers/[email protected]
+      uses: reproducible-containers/buildkit-cache-dance@v3
       with:
-        cache-source: var-lib-apt
-        cache-target: /var/lib/apt
+        cache-map: |
+          {
+            "var-cache-apt": "/var/cache/apt",
+            "var-lib-apt": "/var/lib/apt"
+          }
+        skip-extraction: ${{ steps.cache.outputs.cache-hit }}
     - name: "Build binaries from Dockerfile.artifact"
       run: docker buildx build -o /tmp/slirpbuilds --build-arg SOURCE_DATE_EPOCH --platform=amd64,arm64,arm,s390x,ppc64le,riscv64 -f Dockerfile.artifact .
     - name: "Create /tmp/artifact"

Dockerfile.artifact

@@ -6,9 +6,10 @@
 #   -f Dockerfile.artifact .
 
 ARG LIBSLIRP_COMMIT=v4.9.0
-ARG UBUNTU_VERSION=jammy-20240125
-ARG XX_VERSION=1.2.1@sha256:8879a398dedf0aadaacfbd332b29ff2f84bc39ae6d4e9c0a1109db27ac5ba012
-ARG REPRO_SOURCES_LIST_VERSION=v0.1.0
+# TODO: update from jammy (22.04) to noble (24.04)
+ARG UBUNTU_VERSION=jammy-20250126
+ARG XX_VERSION=1.6.1@sha256:923441d7c25f1e2eb5789f82d987693c47b8ed987c4ab3b075d6ed2b5d6779a3
+ARG REPRO_SOURCES_LIST_VERSION=v0.1.4
 
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
 

Dockerfile.tests

@@ -1,9 +1,8 @@
 ARG LIBSLIRP_COMMIT=v4.9.0
 
-FROM ubuntu:22.04 AS build
+FROM ubuntu:24.04 AS build
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt update && apt install -y automake autotools-dev make gcc libglib2.0-dev libcap-dev libseccomp-dev git ninja-build python3-pip
-RUN pip3 install meson
+RUN apt update && apt install -y automake autotools-dev make gcc libglib2.0-dev libcap-dev libseccomp-dev git ninja-build meson
 RUN git clone https://gitlab.freedesktop.org/slirp/libslirp.git /libslirp
 WORKDIR /libslirp
 ARG LIBSLIRP_COMMIT