From b8007beedc76d7db441b77cc6e13e187e0ef584b Mon Sep 17 00:00:00 2001 From: Markus Greiner Date: Wed, 24 Sep 2025 17:24:16 +0200 Subject: [PATCH] fix(common): registry clean-up enabled, no terminal in github action No longer dryrun for the registry clean-up GHA workflow docker run doesn't use a terminl (erasing -t flag) Test-bot: skip Build-bot: skip --- .github/workflows/cleanup-ghcr.yml | 2 +- resources/docker-images/docker-build.inc.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cleanup-ghcr.yml b/.github/workflows/cleanup-ghcr.yml index c06f1af5d3..15e0a14ec8 100644 --- a/.github/workflows/cleanup-ghcr.yml +++ b/.github/workflows/cleanup-ghcr.yml @@ -38,7 +38,7 @@ jobs: id: cleanup-ghcr uses: dataaxiom/ghcr-cleanup-action@cd0cdb900b5dbf3a6f2cc869f0dbb0b8211f50c4 # v1.0.16 with: - dry-run: true + dry-run: false expand-packages: true packages: keyman-*-ci delete-untagged: true diff --git a/resources/docker-images/docker-build.inc.sh b/resources/docker-images/docker-build.inc.sh index 6366e7b05d..9b68e7e495 100644 --- a/resources/docker-images/docker-build.inc.sh +++ b/resources/docker-images/docker-build.inc.sh @@ -87,7 +87,7 @@ setup_docker() { if [[ "${MSYSTEM:-}" == "MINGW64" ]]; then DOCKER_RUN_ARGS+=(--env DOCKER_RUN_AS_ROOT=1) fi - if [[ -z ${DOCKER_RUNNING:-} ]] ; then + if ! builder_is_running_on_gha ; then DOCKER_RUN_ARGS+=(-t) fi }