Fix and update workflow

ocurrent · Feb 28, 2024 · c8a984e · c8a984e
1 parent 1500147
commit c8a984e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/.github/workflows/main.sh b/.github/workflows/main.sh
@@ -16,6 +16,26 @@ sudo chmod a+x /usr/local/bin/uname
 opam exec -- make
 
 case "$1" in
+    overlayfs)
+        sudo chmod a+x /usr/local/bin/runc
+
+        sudo mkdir /overlayfs
+        sudo mount -t tmpfs -o size=10G tmpfs /overlayfs
+        sudo chown "$(whoami)" /overlayfs
+
+        opam exec -- dune exec -- obuilder healthcheck --store=overlayfs:/overlayfs
+        opam exec -- dune exec -- ./stress/stress.exe --store=overlayfs:/overlayfs
+
+        # Populate the caches from our own GitHub Actions cache
+	mkdir -p /overlayfs/cache/c-opam-archives
+        cp -r ~/.opam/download-cache/* /overlayfs/cache/c-opam-archives/
+        sudo chown -R 1000:1000 /overlayfs/cache/c-opam-archives
+
+        opam exec -- dune exec -- obuilder build -f example.spec . --store=overlayfs:/overlayfs --color=always
+
+        sudo umount /overlayfs
+        ;;
+
     xfs)
         sudo chmod a+x /usr/local/bin/runc
 
@@ -165,6 +185,6 @@ case "$1" in
        ;;
 
     *)
-        printf "Usage: .run-gha-tests.sh [btrfs|rsync_hardlink|rsync_copy|zfs]" >&2
+        printf "Usage: .run-gha-tests.sh [btrfs|rsync_hardlink|rsync_copy|zfs|overlayfs]" >&2
         exit 1
 esac
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -23,14 +23,9 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      # The ppa is needed because of https://www.mail-archive.com/[email protected]/msg5972997.html
-      - run: |
-          sudo add-apt-repository ppa:jonathonf/zfs && \
-          sudo apt-get --allow-releaseinfo-change update
-
       - uses: awalsh128/cache-apt-pkgs-action@latest
         with:
-          packages: btrfs-progs zfs-dkms zfsutils-linux xfsprogs
+          packages: btrfs-progs zfsutils-linux xfsprogs
           version: 2
 
       - name: Checkout code
@@ -55,6 +50,7 @@ jobs:
         run: |
           sudo wget https://github.com/opencontainers/runc/releases/download/$RUNC_VERSION/runc.amd64 -O /usr/local/bin/runc
 
+      - run: $GITHUB_WORKSPACE/.github/workflows/main.sh overlayfs
       - run: $GITHUB_WORKSPACE/.github/workflows/main.sh btrfs
       - run: $GITHUB_WORKSPACE/.github/workflows/main.sh zfs
       - run: $GITHUB_WORKSPACE/.github/workflows/main.sh xfs