Skip to content

Commit a7651e0

Browse files
committed
merge #4944 into opencontainers/runc:main
Kir Kolyshkin (2): ci: show criu version in criu-dev testing ci: bump bats to 1.11.1 LGTMs: AkihiroSuda cyphar
2 parents d34ea2b + 2a7ce15 commit a7651e0

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ task:
1212
HOME: /root
1313
CIRRUS_WORKING_DIR: /home/runc
1414
GO_VER_PREFIX: "1.24."
15-
BATS_VERSION: "v1.11.0"
15+
BATS_VERSION: "v1.11.1"
1616
RPMS: gcc git-core iptables jq glibc-static libseccomp-devel make criu fuse-sshfs container-selinux
1717
# yamllint disable rule:key-duplicates
1818
matrix:

.github/workflows/test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ jobs:
9494
https://github.com/checkpoint-restore/criu.git ~/criu
9595
(cd ~/criu && sudo make -j $(nproc) install-criu)
9696
rm -rf ~/criu
97+
criu --version
9798
9899
- name: install go ${{ matrix.go-version }}
99100
uses: actions/setup-go@v6
@@ -107,7 +108,7 @@ jobs:
107108
- name: Setup Bats and bats libs
108109
uses: bats-core/[email protected]
109110
with:
110-
bats-version: 1.9.0
111+
bats-version: 1.11.1 # Known as BATS_VERSION in other places.
111112
support-install: false
112113
assert-install: false
113114
detik-install: false

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG GO_VERSION=1.24
2-
ARG BATS_VERSION=v1.11.0
2+
ARG BATS_VERSION=v1.11.1
33
ARG LIBSECCOMP_VERSION=2.5.6
44

55
FROM golang:${GO_VERSION}-bookworm

0 commit comments

Comments
 (0)