fix(ci): cleanup before package building, not after #23619
Conversation
twaik
force-pushed
the
cleanup-before-package-building
branch
from
d230a81 to
331905e
Compare
twaik
changed the title
twaik
changed the title
twaik
force-pushed
the
cleanup-before-package-building
branch
from
331905e to
d100fc9
Compare
TomJo2000
force-pushed
the
cleanup-before-package-building
branch
from
d100fc9 to
506c514
Compare
twaik
force-pushed
the
cleanup-before-package-building
branch
from
506c514 to
066497a
Compare
|
|
||
| # Store pid of current process in a file for docker__run_docker_exec_trap | ||
| . "$TERMUX_SCRIPTDIR/scripts/utils/docker/docker.sh"; docker__create_docker_exec_pid_file | ||
|
|
||
| # Get variable CGCT_DIR | ||
| . "$TERMUX_SCRIPTDIR/scripts/properties.sh" | ||
|
|
||
| while (($# >= 1)); do |
There was a problem hiding this comment.
| while (($# >= 1)); do | |
| while (( $# )); do |
Numbers other than 0 are truthy.
| @@ -117,19 +117,19 @@ termux_pkg_upgrade_version() { | |||
| fi | |||
| done < "${TERMUX_SCRIPTDIR}/scripts/big-pkgs.list" | |||
|
|
|||
| if [[ "${big_package}" == "true" ]]; then | |||
| "${TERMUX_SCRIPTDIR}/scripts/run-docker.sh" ./clean.sh | |||
| if [[ "${big_package}" == "true" || "${force_cleanup}" == "true" ]]; then | |||
There was a problem hiding this comment.
If -C causes termux_step_cleanup_packages() to run, which uses the same $TERMUX_CLEANUP_BUILT_PACKAGES_THRESHOLD as ${force_cleanup} does, but clean.sh deletes way more things than termux_step_cleanup_packages() does, and now this changes it so that ${force_cleanup} is checked before ./build-package.sh is run in this file (instead of after), then is -C with build-package.sh in this file still necessary? since, if everything possible was already cleaned with clean.sh right before build-package.sh is run on a single package, then termux_step_cleanup_packages() in this file will now always return without doing anything?
(-C would still be necessary with build-package.sh in packages.yml though, because packages.yml does not use clean.sh)
#23616 (comment)