From 477d18bd8fbe08e5ae630ac907b134293dcab7e5 Mon Sep 17 00:00:00 2001
From: Peter Hunt <pehunt@redhat.com>
Date: Fri, 6 Sep 2024 12:08:28 -0400
Subject: [PATCH 1/2] gh actions: install newer crun

Signed-off-by: Peter Hunt <pehunt@redhat.com>
---
 hack/github-actions-setup | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/hack/github-actions-setup b/hack/github-actions-setup
index ad371667..9f632c03 100755
--- a/hack/github-actions-setup
+++ b/hack/github-actions-setup
@@ -2,8 +2,8 @@
 set -euo pipefail
 
 declare -A VERSIONS=(
+    ["crun"]=1.15
     ["cni-plugins"]=v1.3.0
-    ["runc"]=v1.1.7
     ["bats"]=v1.9.0
 )
 
@@ -13,9 +13,9 @@ main() {
 
     install_packages
     install_conmon
+    install_crun
     install_bats
     install_critools
-    install_runc
     install_cni_plugins
     install_testdeps
     setup_etc_subid
@@ -103,19 +103,13 @@ install_cni_plugins() {
     ls -lah "$CNI_DIR"
 }
 
-install_runc() {
-    URL=https://github.com/opencontainers/runc/releases/download/"${VERSIONS["runc"]}"
-    BINARY=/usr/sbin/runc
-    sudo wget -O "$BINARY" "$URL"/runc.amd64
+install_crun() {
+	URL=https://github.com/containers/crun/releases/download/"${VERSIONS["crun"]}"
+	BINARY=/usr/bin/crun
+    sudo wget -O "$BINARY" "$URL"/crun-"${VERSIONS["crun"]}"-linux-amd64
     sudo chmod +x "$BINARY"
 
-    # Verify the SHA256
-    SUMFILE=runc.sha256sum
-    wget "$URL"/$SUMFILE
-    grep -qw "$(sha256sum "$BINARY" | awk '{ print $1 }')" $SUMFILE
-    rm $SUMFILE
-
-    runc --version
+    crun --version
 }
 
 install_testdeps() {

From d3b09a2d7a07e6f349d85f2b1fd2ac4cb85a38a1 Mon Sep 17 00:00:00 2001
From: Peter Hunt <pehunt@redhat.com>
Date: Fri, 6 Sep 2024 10:23:51 -0400
Subject: [PATCH 2/2] version: bump to 2.1.13

Signed-off-by: Peter Hunt <pehunt@redhat.com>
---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 348fc11e..ea4bd0fb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.12
+2.1.13