From 09c5eeea739fa63f8ec9ccd835462c929de3c5b0 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 16 Oct 2025 12:02:01 -0700 Subject: [PATCH 1/7] 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 f02bc92377f..e4e5a01538e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -106,7 +106,7 @@ jobs: - name: Setup Bats and bats libs uses: bats-core/bats-action@3.0.0 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 f6ad11b287b2f5fb61d532004f3c939dc615aca0 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 16 Oct 2025 12:09:46 -0700 Subject: [PATCH 2/7] 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 e4e5a01538e..3e93780bbd3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -93,6 +93,7 @@ jobs: git clone https://github.com/checkpoint-restore/criu.git ~/criu (cd ~/criu && git checkout ${{ matrix.criu }} && sudo make install-criu) rm -rf ~/criu + criu --version - name: install go ${{ matrix.go-version }} uses: actions/setup-go@v5 From 3808341ef41602192a40de0fb5ffa2a8cf3bd78c Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Tue, 2 Dec 2025 15:22:40 -0800 Subject: [PATCH 3/7] ci: bump bats to 1.12.0 This which is already using in CI on Fedora. Signed-off-by: Kir Kolyshkin (cherry picked from commit f128234354a111b57a4e58543a55a8edc6c453c2) 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 e2f552cbd20..67ebd982f5a 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.1" + BATS_VERSION: "v1.12.0" 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 3e93780bbd3..4df709be58b 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.0 with: - bats-version: 1.11.1 # Known as BATS_VERSION in other places. + bats-version: 1.12.0 # Known as BATS_VERSION in other places. support-install: false assert-install: false detik-install: false diff --git a/Dockerfile b/Dockerfile index ae10e34661f..03de7e49faa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ ARG GO_VERSION=1.24 -ARG BATS_VERSION=v1.11.1 +ARG BATS_VERSION=v1.12.0 ARG LIBSECCOMP_VERSION=2.5.6 FROM golang:${GO_VERSION}-bookworm From 71624790526b855419473844d5465e7f7c507039 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Tue, 2 Dec 2025 15:25:42 -0800 Subject: [PATCH 4/7] Bump seccomp to v2.6.0 This version was released almost a year ago. Signed-off-by: Kir Kolyshkin (cherry picked from commit f4710e50238952025a9de34f11a91731ec278469) Signed-off-by: Kir Kolyshkin --- Dockerfile | 2 +- script/release_build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 03de7e49faa..10da959ff8a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ARG GO_VERSION=1.24 ARG BATS_VERSION=v1.12.0 -ARG LIBSECCOMP_VERSION=2.5.6 +ARG LIBSECCOMP_VERSION=2.6.0 FROM golang:${GO_VERSION}-bookworm ARG DEBIAN_FRONTEND=noninteractive diff --git a/script/release_build.sh b/script/release_build.sh index 39ec3ab5ddf..5e0b90773e2 100755 --- a/script/release_build.sh +++ b/script/release_build.sh @@ -19,7 +19,7 @@ set -e ## ---> # Project-specific options and functions. In *theory* you shouldn't need to # touch anything else in this script in order to use this elsewhere. -: "${LIBSECCOMP_VERSION:=2.5.6}" +: "${LIBSECCOMP_VERSION:=2.6.0}" project="runc" root="$(readlink -f "$(dirname "${BASH_SOURCE[0]}")/..")" From 4bce3cc13cd9f451cfdf6016c035b542e40988a7 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Tue, 2 Dec 2025 15:26:48 -0800 Subject: [PATCH 5/7] Use Go 1.25 for official builds (as well as for testing on Cirrus CI) Signed-off-by: Kir Kolyshkin (cherry picked from commit 79b97d4642755b8b2668dde91d45a43adac62dfc) Signed-off-by: Kir Kolyshkin --- .cirrus.yml | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 67ebd982f5a..5309343fd65 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -11,7 +11,7 @@ task: env: HOME: /root CIRRUS_WORKING_DIR: /home/runc - GO_VER_PREFIX: "1.24." + GO_VER_PREFIX: "1.25." BATS_VERSION: "v1.12.0" RPMS: gcc git-core iptables jq glibc-static libseccomp-devel make criu fuse-sshfs container-selinux # yamllint disable rule:key-duplicates diff --git a/Dockerfile b/Dockerfile index 10da959ff8a..e4f3df3545b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.24 +ARG GO_VERSION=1.25 ARG BATS_VERSION=v1.12.0 ARG LIBSECCOMP_VERSION=2.6.0 From 551ed37e5a149eb166403dddc81e29a379136b52 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Tue, 2 Dec 2025 15:31:52 -0800 Subject: [PATCH 6/7] ci: bump shellcheck to v0.11.0 Signed-off-by: Kir Kolyshkin (cherry picked from commit 68771cfe511bae841c5a4654ba16b35df1b88179) Signed-off-by: Kir Kolyshkin --- .github/workflows/validate.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index a694d99ff84..ba7a4ba7b41 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -110,9 +110,9 @@ jobs: - uses: actions/checkout@v5 - name: install shellcheck env: - VERSION: v0.10.0 + VERSION: v0.11.0 BASEURL: https://github.com/koalaman/shellcheck/releases/download - SHA256: f35ae15a4677945428bdfe61ccc297490d89dd1e544cc06317102637638c6deb + SHA256: 4da528ddb3a4d1b7b24a59d4e16eb2f5fd960f4bd9a3708a15baddbdf1d5a55b run: | mkdir ~/bin curl -sSfL --retry 5 $BASEURL/$VERSION/shellcheck-$VERSION.linux.x86_64.tar.xz | From 2d035157f10671fa734348e1f1455107f1f99874 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Tue, 10 Feb 2026 14:31:04 -0800 Subject: [PATCH 7/7] [1.3] ci: remove Go 1.24.x, add 1.25.x Go 1.24 is no longer supported, and Go 1.25 (which we use in Dockerfile for official binaries) is not being tested against. So remove Go 1.24.x and add Go 1.25.x. We keep Go 1.23.x is this is a minimally required version for this branch. Signed-off-by: Kir Kolyshkin --- .github/workflows/test.yml | 2 +- .github/workflows/validate.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4df709be58b..306778d3256 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,7 +25,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-24.04, ubuntu-24.04-arm] - go-version: [1.23.x, 1.24.x] + go-version: [1.23.x, 1.25.x] rootless: ["rootless", ""] race: ["-race", ""] criu: ["", "criu-dev"] diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index ba7a4ba7b41..d2ff0153bae 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -9,7 +9,7 @@ on: pull_request: workflow_dispatch: env: - GO_VERSION: 1.24 + GO_VERSION: 1.25 permissions: contents: read