From bf4aa0a9d0fc45b1a0edf8cdc3f2b687b8c6d3ea Mon Sep 17 00:00:00 2001
From: Mateus Melchiades <matbme@duck.com>
Date: Thu, 18 Apr 2024 11:56:15 +0000
Subject: [PATCH 1/5] Attempt to fix CI

---
 .github/workflows/go.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 6cc7a12f..e9c2e56e 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -35,7 +35,8 @@ jobs:
 
     - name: Install test dependencies
       run: |
-        curl -s https://raw.githubusercontent.com/89luca89/distrobox/1.6.0/install | sudo sh
+        apt-get install -y podman
+        curl -s https://raw.githubusercontent.com/89luca89/distrobox/1.7.1/install | sudo sh
         ./utils/create_test_env.sh
 
     - name: Test

From ccd8bc2adcc85c3e0247f609f8e30d5dd4cc1cc8 Mon Sep 17 00:00:00 2001
From: Mateus Melchiades <matbme@duck.com>
Date: Thu, 18 Apr 2024 08:58:38 -0300
Subject: [PATCH 2/5] sudo

---
 .github/workflows/go.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index e9c2e56e..cfd95169 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -35,7 +35,7 @@ jobs:
 
     - name: Install test dependencies
       run: |
-        apt-get install -y podman
+        sudo apt-get install -y podman
         curl -s https://raw.githubusercontent.com/89luca89/distrobox/1.7.1/install | sudo sh
         ./utils/create_test_env.sh
 

From 4068e8c5eeca154f47d56fe3f4d019d21ca47f8a Mon Sep 17 00:00:00 2001
From: Mateus Melchiades <matbme@duck.com>
Date: Thu, 18 Apr 2024 09:07:09 -0300
Subject: [PATCH 3/5] Replace crun

---
 .github/workflows/go.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index cfd95169..2d812d92 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -33,9 +33,16 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Install test dependencies
+      # https://noobient.com/2023/11/15/fixing-ubuntu-containers-failing-to-start-with-systemd/
+    - name: Setup podman
       run: |
+        echo -e "Replacing $(crun --version | head -1) with newer"
         sudo apt-get install -y podman
+        sudo CRUN_VER='1.11.2' curl -L "https://github.com/containers/crun/releases/download/${CRUN_VER}/crun-${CRUN_VER}-linux-amd64" -o "/usr/bin/crun"
+        sudo chmod +x "/usr/bin/crun"
+
+    - name: Install test dependencies
+      run: |
         curl -s https://raw.githubusercontent.com/89luca89/distrobox/1.7.1/install | sudo sh
         ./utils/create_test_env.sh
 

From 11b47ff8155110977233c5838786d3ece9ecbd85 Mon Sep 17 00:00:00 2001
From: Mateus Melchiades <matbme@duck.com>
Date: Thu, 18 Apr 2024 09:31:53 -0300
Subject: [PATCH 4/5] Use newer crun version

---
 .github/workflows/go.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 2d812d92..476e9769 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -33,13 +33,17 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-      # https://noobient.com/2023/11/15/fixing-ubuntu-containers-failing-to-start-with-systemd/
-    - name: Setup podman
+    # See both:
+    # https://github.com/actions/runner-images/issues/9425
+    # https://noobient.com/2023/11/15/fixing-ubuntu-containers-failing-to-start-with-systemd/
+    - name: Setup podman and patch crun
+      env:
+        CRUN_VER: 1.14.4
       run: |
-        echo -e "Replacing $(crun --version | head -1) with newer"
         sudo apt-get install -y podman
-        sudo CRUN_VER='1.11.2' curl -L "https://github.com/containers/crun/releases/download/${CRUN_VER}/crun-${CRUN_VER}-linux-amd64" -o "/usr/bin/crun"
-        sudo chmod +x "/usr/bin/crun"
+        echo -e "Replacing $(crun --version | head -1) with newer (${CRUN_VER})"
+        curl -Lo crun "https://github.com/containers/crun/releases/download/${CRUN_VER}/crun-${CRUN_VER}-linux-amd64"
+        sudo install crun /usr/bin/crun
 
     - name: Install test dependencies
       run: |

From ca0fbfeaeab0e2f8c7b410c4d45cd12e814b6bf5 Mon Sep 17 00:00:00 2001
From: Mateus Melchiades <matbme@duck.com>
Date: Thu, 18 Apr 2024 09:34:57 -0300
Subject: [PATCH 5/5] Cleanup

---
 .github/workflows/go.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 476e9769..1bb27d20 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -33,14 +33,14 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    # See both:
-    # https://github.com/actions/runner-images/issues/9425
-    # https://noobient.com/2023/11/15/fixing-ubuntu-containers-failing-to-start-with-systemd/
-    - name: Setup podman and patch crun
+    - name: Install podman
+      run: sudo apt-get install -y podman
+
+    # See: https://github.com/actions/runner-images/issues/9425
+    - name: Patch crun
       env:
         CRUN_VER: 1.14.4
       run: |
-        sudo apt-get install -y podman
         echo -e "Replacing $(crun --version | head -1) with newer (${CRUN_VER})"
         curl -Lo crun "https://github.com/containers/crun/releases/download/${CRUN_VER}/crun-${CRUN_VER}-linux-amd64"
         sudo install crun /usr/bin/crun