Skip to content

Commit 2439dc2

Browse files
AhmedIsmail02urutva
authored andcommitted
fri: Address the issues introduced by Ubuntu update
As a result of updating from Ubuntu v20.04 to v22.04, the following changes had to be made: * The default `setuptools_scm` v8.x requires that `setuptools` package has a version higher than 61. Hence, updating the minimum required `setuptools` version. * The `license_file` is now deprecated and `license_files` option should be used instead. * The way CI-env-private installs `uncrustify` has been changed where it introduced a known issue in the `uncrustify` tool so a workaround has been applied to overcome the issue. Signed-off-by: Ahmed Ismail <[email protected]>
1 parent 79a7f2c commit 2439dc2

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ubuntu: Adapt to ubuntu v22.04 docker image changes.

tools/ci/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[build-system]
2-
requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.4"]
2+
requires = ["setuptools>=61", "wheel", "setuptools_scm[toml]>=3.4"]
33
build-backend = "setuptools.build_meta"
44
[tool.setuptools_scm]
55
local_scheme = "no-local-version"

tools/ci/setup.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022-2023 Arm Limited and/or its affiliates
1+
# Copyright 2022-2025 Arm Limited and/or its affiliates
22
33
# SPDX-License-Identifier: MIT
44

@@ -8,7 +8,7 @@ description = Featured FreeRTOS IoT Integration targeting an Arm Corstone-3xx pl
88
long_description = file: README.md
99
long_description_content_type = text/markdown
1010
license = MIT
11-
license_file = LICENSE
11+
license_files = ['LICENSE']
1212

1313
[options]
1414
packages = find:

tools/scripts/run_uncrustify.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# Copyright 2023-2024 Arm Limited and/or its affiliates
3+
# Copyright 2023-2025 Arm Limited and/or its affiliates
44
55
# SPDX-License-Identifier: MIT
66

@@ -22,3 +22,8 @@ done
2222
exclude_pattern+="./build"
2323

2424
fdfind -E $exclude_pattern -e c -e h -e cc -e cpp --exec uncrustify --no-backup --replace --if-changed -c tools/uncrustify.cfg
25+
# Uncrustify has a known problem where it does not keep track of braces that span multiple preprocessor blocks and therefore will
26+
# abort and complain about missing braces in code leading to returning an error which is not correct. We use git diff to check if
27+
# any files are changed after uncrustify runs, where this will return `1` (error) if any files were altered by uncrustify or `0`
28+
# otherwise.
29+
git diff --exit-code

0 commit comments

Comments
 (0)