From f6e408f7445fbacb8fe6fd9e410dd6a9d443a59a Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 16 Oct 2025 12:02:01 -0700 Subject: [PATCH 1/2] ci: bump bats to 1.11.1 Bump bats to the version from Fedora 42 (used in "fedora" job), so we have the same version everywhere. This also fixes an issue introduced by commit d31e6b87 (which forgot to bump bats in GHA CI), and adds a note to the yaml in order to avoid the same issue in the future. Signed-off-by: Kir Kolyshkin (cherry picked from commit 6af1d637bace0493fdb4dad4177da7624ce22ab4) Signed-off-by: Kir Kolyshkin --- .cirrus.yml | 2 +- .github/workflows/test.yml | 2 +- Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 56453aaae54..e2f552cbd20 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -12,7 +12,7 @@ task: HOME: /root CIRRUS_WORKING_DIR: /home/runc GO_VER_PREFIX: "1.24." - BATS_VERSION: "v1.11.0" + BATS_VERSION: "v1.11.1" RPMS: gcc git-core iptables jq glibc-static libseccomp-devel make criu fuse-sshfs container-selinux # yamllint disable rule:key-duplicates matrix: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4962993c0a0..4237ef1b58a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -107,7 +107,7 @@ jobs: - name: Setup Bats and bats libs uses: bats-core/bats-action@3.0.1 with: - bats-version: 1.9.0 + bats-version: 1.11.1 # Known as BATS_VERSION in other places. support-install: false assert-install: false detik-install: false diff --git a/Dockerfile b/Dockerfile index 26f124ede8e..ae10e34661f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ ARG GO_VERSION=1.24 -ARG BATS_VERSION=v1.11.0 +ARG BATS_VERSION=v1.11.1 ARG LIBSECCOMP_VERSION=2.5.6 FROM golang:${GO_VERSION}-bookworm From 1018d8dc4dfd1608fe791a3d0baa963567519dbb Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 16 Oct 2025 12:09:46 -0700 Subject: [PATCH 2/2] ci: show criu version in criu-dev testing Signed-off-by: Kir Kolyshkin (cherry picked from commit 2a7ce15e68c34e2730958d2169f3205a305323ab) Signed-off-by: Kir Kolyshkin --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4237ef1b58a..1d8ab5cb03d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -94,6 +94,7 @@ jobs: https://github.com/checkpoint-restore/criu.git ~/criu (cd ~/criu && sudo make -j $(nproc) install-criu) rm -rf ~/criu + criu --version - name: install go ${{ matrix.go-version }} uses: actions/setup-go@v6