[soil] Factor out host-shim

Use it on Github Actions.

.github/workflows/all-builds.yml

@@ -36,30 +36,12 @@ jobs:
 
       - name: install
         run: |
-          # It's already installed
-          # sudo apt-get install -y podman
-
-          # Hack for Docker.  We write this file from inside the container and
-          # outside.
-          dir=$REPO_ROOT/_tmp/soil
-          mkdir -p $dir
-          sudo chmod --verbose 777 $dir
-          ls -l -d $dir
+          soil/host-shim.sh docker-mount-perms $REPO_ROOT
 
       - name: dummy
         run: |
-          # Podman gets rid of _tmp/soil permission error.
-          # We write into that directory afterward and then deploy the whole
-          # thing.
-          docker=docker
-          #docker=podman
-          image=docker.io/oilshell/soil-dummy
-
-          time $docker pull $image
-          $docker run \
-              --mount "type=bind,source=$REPO_ROOT,target=/app/oil" \
-              $image \
-              sh -c 'cd /app/oil; soil/worker.sh run-dummy'
+          cd $REPO_ROOT
+          soil/host-shim.sh run-task docker $REPO_ROOT dummy
 
       - name: publish-html
         env:
@@ -83,22 +65,12 @@ jobs:
 
       - name: install
         run: |
-          # Hack for Docker
-          dir=$REPO_ROOT/_tmp/soil
-          mkdir -p $dir
-          sudo chmod --verbose 777 $dir
-          ls -l -d $dir
+          soil/host-shim.sh docker-mount-perms $REPO_ROOT
 
       - name: dev-minimal
         run: |
-          docker=docker
-          image=docker.io/oilshell/soil-dev-minimal
-
-          time $docker pull $image
-          $docker run \
-              --mount "type=bind,source=$REPO_ROOT,target=/app/oil" \
-              $image \
-              sh -c 'cd /app/oil; soil/worker.sh run-dev-minimal'
+          cd $REPO_ROOT
+          soil/host-shim.sh run-task docker $REPO_ROOT dev-minimal
 
       - name: publish-html
         env:

README.md

@@ -178,7 +178,8 @@ shell, of course!
                       # moved to tests/ if automated.
       old/            # A junk drawer.
     web/              # HTML/JS/CSS for tests and tools
-    services/         # Integration with cloud services (e.g. Travis CI)
+    soil/             # Multi-cloud continuous build (e.g. sourcehut, Github)
+    services/         # Other cloud services
 
 ### Temp Dirs
 

soil/host-shim.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+#
+# Shell functions run on the host machine, OUTSIDE the container.
+#
+# Usage:
+#   soil/host-shim.sh <function name>
+
+set -o nounset
+set -o pipefail
+set -o errexit
+
+docker-mount-perms() {
+  local repo_root=$1
+  local dir=$repo_root/_tmp/soil
+  mkdir -p $dir
+  sudo chmod --verbose 777 $dir
+  ls -l -d $dir
+}
+
+run-task() {
+  local docker=$1  # docker or podman
+  local repo_root=$2
+  local task=$3  # e.g. dev-minimal
+
+  local image=docker.io/oilshell/soil-$task
+
+  time $docker pull $image
+
+  $docker run \
+      --mount "type=bind,source=$repo_root,target=/app/oil" \
+      $image \
+      sh -c "cd /app/oil; soil/worker.sh run-$task"
+}
+
+"$@"

soil/worker.sh

@@ -84,7 +84,6 @@ dev-minimal-tasks() {
 
   # (task_name, script, action, result_html)
   cat <<EOF
-link-busybox-ash    test/spec.sh link-busybox-ash -
 build-minimal       build/dev.sh minimal          -
 repo-overview       metrics/source-code.sh all    -
 lint                test/lint.sh travis           -

test/spec.sh

@@ -236,7 +236,12 @@ tea-all() {
 }
 
 osh-minimal() {
-  check-shells-exist  # e.g. depends on link-busybox-ash
+  ### Some tests that work on the minimal build.  Run by Soil.
+
+  # dev-minimal CI task needs this done first
+  link-busybox-ash
+
+  check-shells-exist
 
   # oil-json: for testing yajl
   cat >_tmp/spec/SUITE-osh-minimal.txt <<EOF