diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a08199f0..ed901d40 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,15 +2,14 @@ name: ci on: [push, pull_request] jobs: linux: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - name: install bats shell: bash run: | - sudo apt update - sudo apt -y install bats - apt-get bash + sudo apt-get update + sudo apt-get install bats - name: Run a one-line script run: make test diff --git a/ramalama/cli.py b/ramalama/cli.py index e63ed788..6d89e1b0 100644 --- a/ramalama/cli.py +++ b/ramalama/cli.py @@ -462,7 +462,7 @@ def run_container(args): conman, "run", "--rm", - "-it", + "-i", "--label", "RAMALAMA container", "--security-opt=label=disable", @@ -475,6 +475,9 @@ def run_container(args): f"-v{wd}:/usr/share/ramalama/ramalama:ro", ] + if sys.stdout.isatty(): + conman_args += ["-t"] + if hasattr(args, "detach") and args.detach is True: conman_args += ["-d"] diff --git a/test/system/010-list.bats b/test/system/010-list.bats index fb115a6d..a8a8741d 100644 --- a/test/system/010-list.bats +++ b/test/system/010-list.bats @@ -6,7 +6,7 @@ load helpers headings="NAME *MODIFIED *SIZE" run_ramalama list - is "${lines[0]}" "$headings" "header line" + is ".*$lines" "$headings" "header line" run_ramalama list --noheading assert "${lines[0]}" !~ "$headings" "header line should not be there" diff --git a/test/system/helpers.bash b/test/system/helpers.bash index 055609c1..fc20aab2 100644 --- a/test/system/helpers.bash +++ b/test/system/helpers.bash @@ -281,7 +281,7 @@ function clean_setup() { # Yes, but it's also tremendously slower: 29m for a CI run, to 39m. # Image loads are slow. found_needed_image= - _run_ramalama_quiet list +#FIXME _run_ramalama_quiet list for line in "${lines[@]}"; do set $line