Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev lenny 5 #2176

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Dev lenny 5 #2176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cd21a9
[deps] Rebuilt spec-bin wedges and soil-ovm-tarball image
Dec 21, 2024
656e9bc
[soil] re-enable tarball with new image
Dec 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions build/deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1097,21 +1097,24 @@ boxed-wedges() {
}

boxed-spec-bin() {
if false; then
deps/wedge.sh boxed deps/source.medo/bash '4.4'
fi

if true; then
#deps/wedge.sh boxed deps/source.medo/bash '4.4'
deps/wedge.sh boxed deps/source.medo/bash '5.2.21'
fi

if false; then
if true; then
deps/wedge.sh boxed deps/source.medo/dash
deps/wedge.sh boxed deps/source.medo/mksh
fi

if false; then
if true; then
# Note: zsh requires libncursesw5-dev
#deps/wedge.sh boxed deps/source.medo/zsh
deps/wedge.sh boxed deps/source.medo/zsh

#deps/wedge.sh boxed deps/source.medo/busybox
deps/wedge.sh boxed deps/source.medo/busybox

# Problem with out of tree build, as above. Skipping for now
deps/wedge.sh boxed deps/source.medo/yash
Expand Down
6 changes: 5 additions & 1 deletion deps/images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@
#
# deps/images.sh build wedge-bootstrap-debian-10 T
# deps/images.sh push wedge-bootstrap-debian-10 v-2024-06-08
#
# Building wedges:
#
# deps/wedge.sh boxed-spec-bin

set -o nounset
set -o pipefail
Expand All @@ -47,7 +51,7 @@ source deps/podman.sh
DOCKER=${DOCKER:-docker}

# Build with this tag
readonly LATEST_TAG='v-2024-12-05'
readonly LATEST_TAG='v-2024-12-20'

# BUGS in Docker.
#
Expand Down
4 changes: 2 additions & 2 deletions soil/host-shim.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ live-image-tag() {
echo 'v-2023-08-09'
;;
ovm-tarball)
# bash 5.2.21
echo 'v-2024-06-09b'
# Lib/collections.py patch for OVM tarball
echo 'v-2024-12-20'
;;
other-tests)
# freshen up
Expand Down
5 changes: 2 additions & 3 deletions soil/worker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,8 @@ ovm-tarball-tasks() {
os-info soil/diagnose.sh os-info -
dump-env soil/diagnose.sh dump-env -
py-all build/py.sh all -
make-tarball devtools/release.sh py-tarball _release/oil.tar
ysh-ovm-tarball test/spec-py.sh ysh-ovm-tarball _tmp/spec/ysh-py/index.html
syscall test/syscall.sh soil-run _tmp/syscall/-wwz-index
osh-spec test/spec-py.sh osh-all-serial _tmp/spec/osh-py/index.html
gold test/gold.sh soil-run -
Expand All @@ -345,9 +347,6 @@ EOF
# doc-metrics is a no-op, just for the link. Because soil-run just runs the
# release, which creates metrics.

# TODO: restore these after fixing fallout from vendor/typing.py
#make-tarball devtools/release.sh py-tarball _release/oil.tar
#ysh-ovm-tarball test/spec-py.sh ysh-ovm-tarball _tmp/spec/ysh-py/index.html
}

# Reuse ovm-tarball container
Expand Down