Remove mktree.docker symlink

dmnks · Oct 27, 2023 · 216033f · 216033f
1 parent 553af1a
commit 216033f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -5,12 +5,13 @@ on: [push, pull_request]
 jobs:
   build_and_test:
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v3
       - name: Build the Fedora testing environment
-        run: sudo ./mktree.docker build
+        run: sudo ./mktree.oci build
         working-directory: ./tests
       - name: Run the test suite
-        run: sudo ./mktree.docker check --unattended -j$(nproc)
+        run: sudo ./mktree.oci check --unattended -j$(nproc)
         working-directory: ./tests
+      env:
+        PODMAN: docker
diff --git a/tests/mktree.docker b/tests/mktree.docker
diff --git a/tests/mktree.oci b/tests/mktree.oci
@@ -10,7 +10,7 @@ if [ "$PROGRAM" == "mktree" ]; then
     NATIVE=@MKTREE_NATIVE@
 else
     # Running from source directory
-    PODMAN=$(echo $PROGRAM | cut -d'.' -f2)
+    PODMAN=${PODMAN:-podman}
     CONTEXT=..
     NATIVE=no
 fi
@@ -55,7 +55,7 @@ unshared()
 case $CMD in
     build) unshared
         # Build base image
-        $PODMAN build --target base -t $IMAGE/base $BUILD_ARGS
+        echo $PODMAN build --target base -t $IMAGE/base $BUILD_ARGS
 
         # Add RPM install on top
         [ -n "$($PODMAN images -q $IMAGE)" ] && $PODMAN rmi $IMAGE