From 6b5d66d726325ed83d3917514c2a60558a2e0554 Mon Sep 17 00:00:00 2001 From: RobMeades Date: Sun, 22 Oct 2023 23:12:36 +0100 Subject: [PATCH] Test Github action fix only: fail on AStyle failure. The Github action wasn't failing if AStyle returned an error. It does now. --- .github/workflows/style.yml | 3 +-- astyle.py | 6 +++--- gnss/api/u_gnss_cfg.h | 3 --- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index b8791b216..37eecc715 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -18,5 +18,4 @@ jobs: sudo apt install doxygen astyle python3 - name: check run: | - python3 astyle.py - UBX_WORKDIR="$(pwd)" doxygen + python3 astyle.py && UBX_WORKDIR="$(pwd)" doxygen \ No newline at end of file diff --git a/astyle.py b/astyle.py index b36ca5200..eb5194f84 100644 --- a/astyle.py +++ b/astyle.py @@ -13,11 +13,11 @@ stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True) as astyle: fail = False - output = astyle.communicate() - for line in output: + output, _ = astyle.communicate() + for line in output.splitlines(): if line.startswith("Formatted"): fail = True - print (line, end="") + print (line) if astyle.returncode != 0: fail = True sys.exit(1 if fail else 0) diff --git a/gnss/api/u_gnss_cfg.h b/gnss/api/u_gnss_cfg.h index 91ae7c225..8835ccb7c 100644 --- a/gnss/api/u_gnss_cfg.h +++ b/gnss/api/u_gnss_cfg.h @@ -696,9 +696,6 @@ int32_t uGnssCfgValDelList(uDeviceHandle_t gnssHandle, * values to delete; only the keyId member of each * item is relevant, the others are ignored; must * be NULL if numValues is 0. Wild-cards are permitted. - * @param numValues the number of items in the array pointed-to by pList; - * may be zero if the only purpose of this call is to - * execute a transaction. * @param transaction use #U_GNSS_CFG_VAL_TRANSACTION_NONE to delete a single * list of values; if you wish to begin deleting a sequence * of values (which can each be single values or lists) that