diff options
author | Christopher Haster <chaster@utexas.edu> | 2022-03-15 08:42:28 +0300 |
---|---|---|
committer | Christopher Haster <chaster@utexas.edu> | 2022-03-20 11:39:23 +0300 |
commit | 316b019f41105a9cc88e2106e827711ec6aaf122 (patch) | |
tree | f37a7db4e91d10329e8d479fe02b6ef2a84500ad /.github/workflows | |
parent | 8475c8064d2cccba1790ebeb134b283d0ac912e8 (diff) |
In CI, determine loop devices dynamically to avoid conflicts with Ubuntu snaps
Introduced when updating CI to Ubuntu 20.04, Ubuntu snaps consume
loop devices, which conflict with out assumption that /dev/loop0
will always be unused. Changed to request a dynamic loop device from
losetup, though it would have been nice if Ubuntu snaps allocated
from the last device or something.
Diffstat (limited to '.github/workflows')
-rw-r--r-- | .github/workflows/test.yml | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 787feb8..a27157f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -311,16 +311,18 @@ jobs: # setup disk for littlefs-fuse mkdir mount - sudo chmod a+rw /dev/loop0 + LOOP=$(sudo losetup -f) + sudo chmod a+rw $LOOP dd if=/dev/zero bs=512 count=128K of=disk - losetup /dev/loop0 disk + losetup $LOOP disk + echo "LOOP=$LOOP" >> $GITHUB_ENV - name: test run: | # self-host test make -C littlefs-fuse - littlefs-fuse/lfs --format /dev/loop0 - littlefs-fuse/lfs /dev/loop0 mount + littlefs-fuse/lfs --format $LOOP + littlefs-fuse/lfs $LOOP mount ls mount mkdir mount/littlefs @@ -362,9 +364,11 @@ jobs: # setup disk for littlefs-fuse mkdir mount - sudo chmod a+rw /dev/loop0 + LOOP=$(sudo losetup -f) + sudo chmod a+rw $LOOP dd if=/dev/zero bs=512 count=128K of=disk - losetup /dev/loop0 disk + losetup $LOOP disk + echo "LOOP=$LOOP" >> $GITHUB_ENV - name: test run: | # compile v1 and v2 @@ -372,8 +376,8 @@ jobs: make -C v2 # run self-host test with v1 - v1/lfs --format /dev/loop0 - v1/lfs /dev/loop0 mount + v1/lfs --format $LOOP + v1/lfs $LOOP mount ls mount mkdir mount/littlefs @@ -387,8 +391,8 @@ jobs: cd ../.. fusermount -u mount - v2/lfs --migrate /dev/loop0 - v2/lfs /dev/loop0 mount + v2/lfs --migrate $LOOP + v2/lfs $LOOP mount # run self-host test with v2 right where we left off ls mount |