diff --git a/build/common.sh b/build/common.sh index 52840fc5e8..60dfdff215 100644 --- a/build/common.sh +++ b/build/common.sh @@ -42,7 +42,7 @@ readonly CLANG_LINK_FLAGS='' readonly PY27=Python-2.7.13 -readonly PREPARE_DIR=_devbuild/cpython-full +readonly PREPARE_DIR=_deps/cpython-full # Used by misc/bin.sh and opy/build.sh readonly OIL_SYMLINKS=(oil oilc osh oshc tea sh true false readlink) diff --git a/devtools/release.sh b/devtools/release.sh index d3c2d755d8..abf73f2a4b 100755 --- a/devtools/release.sh +++ b/devtools/release.sh @@ -867,8 +867,8 @@ tarball-build-deps() { # On Travis, the _devbuild and _deps dirs should be cached. #if false; then - if test -d _devbuild/cpython-full; then - echo '_devbuild/cpython-full exists: skipping build/prepare.sh' + if test -d _deps/cpython-full; then + echo '_deps/cpython-full exists: skipping build/prepare.sh' else build/prepare.sh configure build/prepare.sh build-python diff --git a/opy/common.sh b/opy/common.sh index 4fe04b74cc..06b38301f2 100644 --- a/opy/common.sh +++ b/opy/common.sh @@ -44,7 +44,6 @@ oil-python-sources() { -name _deps -a -prune -o \ -name _regtest -a -prune -o \ -name mycpp -a -prune -o \ - -name cpython-full -a -prune -o \ -name testdata -a -prune -o \ -name Python-2.7.13 -a -prune -o \ -name py-yajl -a -prune -o \ diff --git a/services/sourcehut.sh b/services/sourcehut.sh index c0119c0acc..886ba56e50 100755 --- a/services/sourcehut.sh +++ b/services/sourcehut.sh @@ -50,4 +50,13 @@ publish-html-assuming-ssh-key() { return $status } +# +# For create-cache.yml +# + +compress-deps() { + ### Compress output of tarball-deps and spec-deps + echo TODO +} + "$@" diff --git a/services/toil-worker.sh b/services/toil-worker.sh index 8f4211342f..3b23803c2f 100755 --- a/services/toil-worker.sh +++ b/services/toil-worker.sh @@ -166,6 +166,7 @@ create-cache-tasks() { cat <