From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 14 Mar 2024 07:16:32 +0000 (+0100)
Subject: ci: Remove btrfs logic
X-Git-Tag: v22~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08bd0309f39e915dcf392ea0823c2a998f01b446;p=thirdparty%2Fmkosi.git

ci: Remove btrfs logic

Doesn't seem to noticeably speed things up.
---

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 76c5a81d9..7148a70b0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -142,25 +142,11 @@ jobs:
         sudo ln -svf $PWD/bin/mkosi /usr/bin/mkosi
       working-directory: ./
 
-    - name: Btrfs
-      run: |
-        truncate --size=20G btrfs.raw
-        mkfs.btrfs btrfs.raw
-        sudo mkdir -p /mnt/mkosi
-        LOOP="$(sudo losetup --find --show --direct-io=on btrfs.raw)"
-        sudo mount "$LOOP" /mnt/mkosi --options compress=zstd:1,user_subvol_rm_allowed,noatime,discard=async,space_cache=v2
-        sudo chown "$(id -u):$(id -g)" /mnt/mkosi
-
     - name: Configure
       run: |
         tee mkosi.local.conf <<EOF
         [Output]
         ManifestFormat=json
-        UseSubvolumes=yes
-
-        CacheDirectory=/mnt/mkosi/mkosi.cache
-        PackageCacheDirectory=/mnt/mkosi/mkosi.cache
-        WorkspaceDirectory=/mnt/mkosi
 
         [Content]
         KernelCommandLine=systemd.default_device_timeout_sec=180
@@ -188,8 +174,7 @@ jobs:
 
     - name: Run integration tests
       run: |
-        sudo TMPDIR=/mnt/mkosi \
-            timeout -k 30 1h python3 -m pytest \
+        sudo timeout -k 30 1h python3 -m pytest \
             --tb=no \
             --capture=no \
             --verbose \