From 19520d7b1642cb47a01e906f03801c1ce0774ab9 Mon Sep 17 00:00:00 2001 From: KunoiSayami Date: Wed, 26 Oct 2022 01:58:41 +0800 Subject: feat(script): Optimize local debug docker build * fix(ci): Fix gitlab ci script Signed-off-by: KunoiSayami --- utils/pkgbuild_bootstrap | 2 +- utils/update-db.py | 2 +- utils/upload.py | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'utils') diff --git a/utils/pkgbuild_bootstrap b/utils/pkgbuild_bootstrap index 7f251f8..c84ea94 100755 --- a/utils/pkgbuild_bootstrap +++ b/utils/pkgbuild_bootstrap @@ -5,6 +5,7 @@ if [ -z "$DOCKER_SETUP_SCRIPT" ]; then cd "$(dirname "$0")" cd ../../ echo "Current pwd: $(pwd)" + sudo pacman -Sy fi set -Eeo pipefail @@ -48,6 +49,5 @@ fi curl -fL -o remote.db "$REMOTE_DATABASE" -sudo pacman -Sy ./utils/pkgbuild.py remote.db $FLAGS diff --git a/utils/update-db.py b/utils/update-db.py index acdc8c8..394a9ad 100755 --- a/utils/update-db.py +++ b/utils/update-db.py @@ -62,4 +62,4 @@ if __name__ == "__main__": level=logging.DEBUG, format="%(asctime)s - %(levelname)s - %(funcName)s - %(lineno)d - %(message)s", ) - main(args_.cwd, args_.basename, args_.sign_key) + asyncio.run(main(args_.cwd, args_.basename, args_.sign_key)) diff --git a/utils/upload.py b/utils/upload.py index 07f8628..8bb3114 100755 --- a/utils/upload.py +++ b/utils/upload.py @@ -40,8 +40,10 @@ async def main(args: argparse.Namespace) -> int: if ".pkg" in file: pending_upload.append(file) + logger.debug("Pending upload (%d): %s", len(pending_upload), pending_upload) + if not len(pending_upload): - logger.debug("Could not find any packaged packages, skip upload") + logger.info("Could not find any packaged packages, skip upload") return 0 async with aiohttp.ClientSession( @@ -52,7 +54,7 @@ async def main(args: argparse.Namespace) -> int: ): pass for file in pending_upload: - logger.info("Start upload %s (%s)", sizeof_fmt(os.stat(file).st_size)) + logger.info("Start upload %s (%s)", file, sizeof_fmt(os.stat(file).st_size)) await send_file(session, args, file) async with session.post(args.remote_address, data=build_data(args, "UPLOADED")): pass -- cgit v1.3.1