Merge branch 'staging' into dev

This commit is contained in:
Andrew Walsh 2022-11-23 22:17:27 -08:00 committed by GitHub
commit d60cdfeedc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions

7
install_and_cache_pkgs.sh Executable file → Normal file
View file

@ -37,6 +37,13 @@ write_manifest "main" "${manifest_main}" "${cache_dir}/manifest_main.log"
log_empty_line
log "Installing apt-fast for optimized installs..."
# Install apt-fast for optimized installs.
/bin/bash -c "$(curl -sL https://git.io/vokNn)"
log "done"
log_empty_line
log "Updating APT package list..."
last_update_delta_s=$(($(date +%s) - $(date +%s -r /var/cache/apt/pkgcache.bin)))
if test $last_update_delta_s -gt 300; then

7
pre_cache_action.sh Executable file → Normal file
View file

@ -51,13 +51,6 @@ log "done"
log_empty_line
log "Installing apt-fast for optimized installs..."
# Install apt-fast for optimized installs.
/bin/bash -c "$(curl -sL https://git.io/vokNn)"
log "done"
log_empty_line
versioned_packages=""
log "Verifying packages..."
for package in ${packages}; do