]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
ci: Remove btrfs logic
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Thu, 14 Mar 2024 07:16:32 +0000 (08:16 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Thu, 14 Mar 2024 08:30:37 +0000 (09:30 +0100)
Doesn't seem to noticeably speed things up.

.github/workflows/ci.yml

index 76c5a81d9759b97e2898bd1f5af6819840ee3c6a..7148a70b02080ff579a6715e05493e51dbc722c1 100644 (file)
@@ -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 \