Skip to content

Commit

Permalink
[soil] Re-enable app-tests task
Browse files Browse the repository at this point in the history
Add a hack to reuse the 'ovm-tarball' container image.

This is part of #762.
  • Loading branch information
Andy C committed Jan 7, 2022
1 parent 8c85a9b commit 2a4b1aa
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 3 deletions.
27 changes: 27 additions & 0 deletions .github/workflows/all-builds.yml
Expand Up @@ -134,6 +134,33 @@ jobs:
cd $REPO_ROOT
soil/github-actions.sh publish-html
app-tests:
runs-on: ubuntu-20.04
env:
REPO_ROOT: ${{ github.workspace }}
steps:
- name: Check out repository code
uses: actions/checkout@v2
with:
submodules: recursive

- name: mount-perms
run: |
soil/host-shim.sh mount-perms $REPO_ROOT
- name: app-tests
run: |
cd $REPO_ROOT
soil/host-shim.sh run-job-uke docker $REPO_ROOT app-tests
- name: publish-html
env:
# for deploying to dashboard
TOIL_KEY: ${{ secrets.TOIL_KEY }}
run: |
cd $REPO_ROOT
soil/github-actions.sh publish-html
cpp:
runs-on: ubuntu-18.04
env:
Expand Down
9 changes: 7 additions & 2 deletions soil/host-shim.sh
Expand Up @@ -29,8 +29,13 @@ run-job-uke() {
local repo_root=$2
local task=$3 # e.g. dev-minimal

# docker.io is the namespace for hub.docker.com
local image="docker.io/oilshell/soil-$task"
if test "$task" = 'app-tests'; then
# Hack to reuse this container for build/dev.sh all
local image="docker.io/oilshell/soil-ovm-tarball"
else
# docker.io is the namespace for hub.docker.com
local image="docker.io/oilshell/soil-$task"
fi

local metadata_dir=$repo_root/_tmp/soil

Expand Down
2 changes: 1 addition & 1 deletion soil/worker.sh
Expand Up @@ -178,9 +178,9 @@ test-tarball build/test.sh oil-tar -
EOF
}

# Reuse ovm-tarball container
app-tests-tasks() {
cat <<EOF
tarball-deps devtools/release.sh tarball-build-deps -
yajl build/dev.sh yajl-release -
dev-all build/dev.sh all -
ble-clone test/ble.sh clone -
Expand Down

0 comments on commit 2a4b1aa

Please sign in to comment.