From 2947f26eb53ee7ca2bdbd0a17a59bf6fb25a14b5 Mon Sep 17 00:00:00 2001 From: John Sirois Date: Sat, 2 Dec 2023 21:59:01 -0600 Subject: [PATCH] Force interactive mode. --- .github/workflows/ci.yml | 2 +- dtox.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b89795c7a..a9118ecec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,7 +98,7 @@ jobs: ssh-private-key: ${{ env.SSH_PRIVATE_KEY }} - name: Run Tests run: | - TERM=xterm \ + INTERACTIVE=true \ BASE_MODE=pull \ CACHE_MODE=pull \ ./dtox.sh -e ${{ matrix.tox-env }} -- ${{ env._PEX_TEST_POS_ARGS }} diff --git a/dtox.sh b/dtox.sh index a5814a9d2..d76ca0435 100755 --- a/dtox.sh +++ b/dtox.sh @@ -77,7 +77,7 @@ if [[ "${1:-}" == "inspect" ]]; then --entrypoint bash ) fi -if [[ -t 1 ]]; then +if [[ -n "${INTERACTIVE:-}" || -t 1 ]]; then DOCKER_ARGS+=( --interactive --tty