From 63d1ed15841f55644ddba6c93a7026b18fab11ac Mon Sep 17 00:00:00 2001
From: Rahammetoela Toekiman <fusekai@outlook.com>
Date: Wed, 4 Sep 2024 11:26:26 -0300
Subject: [PATCH 1/2] Update ubuntu-touch.yml for 20.04

---
 .github/workflows/ubuntu-touch.yml | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ubuntu-touch.yml b/.github/workflows/ubuntu-touch.yml
index 86feb0fd7bc..82b4472b5f5 100644
--- a/.github/workflows/ubuntu-touch.yml
+++ b/.github/workflows/ubuntu-touch.yml
@@ -43,27 +43,14 @@ jobs:
           fetch-depth: 0
           submodules: recursive
 
-      - name: Install clickable
-        run: |
-          # For whatever reason, I have to manually install runc before 
-          # docker.io or containerd, else it fails because of broken dependency
-          # Using apt-get because apt complains it shouldn't be used in scripts
-          sudo apt-get update
-          sudo apt-get install -y runc
-          sudo apt-get install -y docker.io adb git python3 python3-pip
-          pip3 install --user git+https://gitlab.com/clickable/clickable.git
-
-          # Clickable requires a reboot. This is a sneaky way to bypass that :^)
-          sudo systemctl unmask docker.service
-          sudo systemctl start docker.service
-
       - name: Build (no OpenGL)
         if: ${{ matrix.opengl == 'sdl' }}
         env:
           BUILD_TYPE: ${{ (matrix.build_type == 'Debug') && '--debug' || '' }}
-          ARCH: ${{ matrix.arch }}
-        run: |
-          ~/.local/bin/clickable build --verbose ${BUILD_TYPE} --arch ${ARCH}
+        uses: tuxecure/clickable@v1
+        with:
+          image: clickable/ci-20.04-${{ matrix.arch }}
+          run: clickable build --verbose ${BUILD_TYPE} --arch ${{ matrix.arch }}
 
       - uses: actions/upload-artifact@v4
         with:

From 3458e7e10d8647976a712c6138b50c27de6c7d19 Mon Sep 17 00:00:00 2001
From: Rahammetoela Toekiman <fusekai@outlook.com>
Date: Wed, 4 Sep 2024 11:27:41 -0300
Subject: [PATCH 2/2] Update bsd.yml

remove orphaned line?
---
 .github/workflows/bsd.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/bsd.yml b/.github/workflows/bsd.yml
index 04886446cf0..31eab91d10b 100644
--- a/.github/workflows/bsd.yml
+++ b/.github/workflows/bsd.yml
@@ -80,4 +80,3 @@ jobs:
             make -j3 VERBOSE=1
             make install DESTDIR="/tmp/supertux" VERBOSE=1
             ./test_supertux2
-actions/checkout@v4
\ No newline at end of file