Skip to content

Commit

Permalink
Fix CI
Browse files Browse the repository at this point in the history
Use ubuntu 22.04, maybe we can move to 24.04 also in another PR.

Signed-off-by: Eric Curtin <ecurtin@redhat.com>
  • Loading branch information
ericcurtin committed Sep 25, 2024
1 parent ab488f1 commit 56d5c15
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 4 additions & 1 deletion ramalama/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ def run_container(args):
conman,
"run",
"--rm",
"-it",
"-i",
"--label",
"RAMALAMA container",
"--security-opt=label=disable",
Expand All @@ -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"]

Expand Down
2 changes: 1 addition & 1 deletion test/system/010-list.bats
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/system/helpers.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 56d5c15

Please sign in to comment.