Skip to content

Commit

Permalink
[soil/dev-setup] Show wedge tree
Browse files Browse the repository at this point in the history
[github-actions] Run dev-setup on Ubuntu 22
  • Loading branch information
Andy C committed Jan 19, 2024
1 parent 2b805e1 commit cb95871
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/all-builds.yml
Expand Up @@ -72,7 +72,7 @@ jobs:
soil/github-actions.sh publish-and-exit raw-vm T
dev-setup:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
REPO_ROOT: ${{ github.workspace }}
steps:
Expand Down
41 changes: 27 additions & 14 deletions build/deps.sh
Expand Up @@ -91,27 +91,29 @@ rm-oils-crap() {
sudo rm -r -f -v /wedge
}

# python2-dev is no longer available on Debian 12
# python-dev also seems gone
#
# wget: for fetching wedges (not on Debian by default!)
# tree: tiny package that's useful for showing what we installed
# g++: essential
# libreadline-dev: needed for the build/prepare.sh Python build.
# gawk: used by spec-runner.sh for the special match() function.
# cmake: for cmark
# PY3_BUILD_DEPS - I think these will be used for building the Python 2 wedge
# as well
readonly -a WEDGE_DEPS_DEBIAN=(
wget tree g++ gawk libreadline-dev ninja-build cmake
"${PY3_BUILD_DEPS[@]}"
)

install-ubuntu-packages() {
### Packages for build/py.sh all, building wedges, etc.

# python2-dev is no longer available on Debian 12
# python-dev also seems gone
#
# wget: for fetching wedges (not on Debian by default!)
# g++: essential
# libreadline-dev: needed for the build/prepare.sh Python build.
# gawk: used by spec-runner.sh for the special match() function.
# cmake: for cmark
# PY3_BUILD_DEPS - I think these will be used for building the Python 2 wedge
# as well

set -x # show what needs sudo

# pass -y for say gitpod
sudo apt "$@" install \
wget g++ gawk libreadline-dev ninja-build cmake \
"${PY3_BUILD_DEPS[@]}"
sudo apt "$@" install "${WEDGE_DEPS_DEBIAN[@]}"
set +x

# maybe pass -y through
Expand Down Expand Up @@ -441,4 +443,15 @@ container-wedges() {

}

show-wedge-tree() {
# 4 levels deep shows the package
if command -v tree > /dev/null; then
tree -S -L 4 /wedge ~/wedge
echo
fi

# Sizes
du --si -s /wedge/*/*/* ~/wedge/*/*/*
}

run-task "$@"
1 change: 1 addition & 0 deletions soil/worker.sh
Expand Up @@ -72,6 +72,7 @@ fetch build/deps.sh fetch -
install-wedges build/deps.sh install-wedges -
py-all-and-ninja soil/worker.sh py-all-and-ninja -
smoke-test build/dev-setup-test.sh smoke-test -
show-wedge-tree build/deps.sh show-wedge-tree -
EOF

# Fails on Ubuntu 20 because python2-dev isn't set up
Expand Down

0 comments on commit cb95871

Please sign in to comment.