Skip to content

Commit

Permalink
Merge branch 'latest' into net
Browse files Browse the repository at this point in the history
Signed-off-by: Matthieu Baerts (NGI0) <[email protected]>
  • Loading branch information
matttbe committed Jul 31, 2024
2 parents 3ab1546 + 162b9e0 commit 1d25cb9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ RUN cd /opt && \
make install

# Virtme NG
ARG VIRTME_NG_VERSION="1.25"
ARG VIRTME_NG_VERSION="1.27"
RUN pip3 install --break-system-packages virtme-ng=="${VIRTME_NG_VERSION}"

# to quickly shutdown the VM and more
Expand Down
5 changes: 4 additions & 1 deletion entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1411,7 +1411,7 @@ _gen_results_files() {
# $1: mode, rest: args for kconfig
analyze() {
# reduce log that could be wrongly interpreted
set +x
set_trace_off

local mode="${1}"
shift
Expand Down Expand Up @@ -1470,6 +1470,8 @@ analyze() {
printerr "Critical issue(s) detected, exiting"
exit 1
fi

set_trace_on
}

# $@: args for kconfig
Expand Down Expand Up @@ -1692,6 +1694,7 @@ case "${INPUT_MODE}" in
esac

if is_ci && [ "${INPUT_CI_PRINT_EXIT_CODE}" = 1 ]; then
set_trace_off
echo "==EXIT_STATUS=${EXIT_STATUS}=="
else
exit "${EXIT_STATUS}"
Expand Down

0 comments on commit 1d25cb9

Please sign in to comment.