osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/39796?usp=email )
Change subject: lint/lint_diff: run clang-format if config was found
......................................................................
lint/lint_diff: run clang-format if config was found
The osmo-asf4-dfu and osmo-ccid-firmware now have clang-format configs.
Adjust the lint script to run clang-format if such a config is found in
the repository for which the lint script is running.
Change-Id: Ie210966ebfbada43dd8507b9b48218df4925820d
---
M lint/lint_diff.sh
1 file changed, 20 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/96/39796/1
diff --git a/lint/lint_diff.sh b/lint/lint_diff.sh
index 9458ca7..60fd8b1 100755
--- a/lint/lint_diff.sh
+++ b/lint/lint_diff.sh
@@ -46,6 +46,25 @@
fi
}
+test_clang_format() {
+ if ! [ -e ".clang-format" ] || ! command -v clang-format >/dev/null; then
+ return
+ fi
+
+ echo "Running clang-format on 'git diff $COMMIT'..."
+ echo
+
+ # Run clang-format-diff and colorize its output
+ local diff="$(git diff -U0 --relative "$COMMIT" \
+ | clang-format-diff -p1 \
+ | sed 's/^-/\x1b[41m-/;s/^+/\x1b[42m+/;s/^@/\x1b[34m@/;s/$/\x1b[0m/')"
+
+ if ! [ -z "$diff" ]; then
+ ERROR=1
+ echo "$diff"
+ fi
+}
+
show_error() {
echo
echo "Please fix the linting errors above. More information:"
@@ -86,6 +105,7 @@
set_commit
test_docker_run_rm
test_checkpatch
+test_clang_format
if [ "$ERROR" = 1 ]; then
show_error
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39796?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ie210966ebfbada43dd8507b9b48218df4925820d
Gerrit-Change-Number: 39796
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39793?usp=email )
Change subject: (do not merge) linter test
......................................................................
Abandoned
--
To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39793?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: abandon
Gerrit-Project: osmo-asf4-dfu
Gerrit-Branch: master
Gerrit-Change-Id: I0f8b3776f3eb7b3d1999be9fef61bc060d8d4e2e
Gerrit-Change-Number: 39793
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39793?usp=email )
Change subject: (do not merge) linter test
......................................................................
(do not merge) linter test
Change-Id: I0f8b3776f3eb7b3d1999be9fef61bc060d8d4e2e
---
M atmel_start.c
1 file changed, 4 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/93/39793/1
diff --git a/atmel_start.c b/atmel_start.c
index b788d5a..9c4daf6 100644
--- a/atmel_start.c
+++ b/atmel_start.c
@@ -3,8 +3,7 @@
/**
* Initializes MCU, drivers and middleware in the project
**/
-void atmel_start_init(void)
-{
- system_init();
- // do not init usb here: might not be needed.
-}
+void atmel_start_init( void ){system_init(
+);
+ // do not init usb here: might not be needed.
+ }
--
To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39793?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-asf4-dfu
Gerrit-Branch: master
Gerrit-Change-Id: I0f8b3776f3eb7b3d1999be9fef61bc060d8d4e2e
Gerrit-Change-Number: 39793
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39792?usp=email )
Change subject: contrib/jenkins.sh: Fix LATEST_BIN variable setting for tagged versions
......................................................................
contrib/jenkins.sh: Fix LATEST_BIN variable setting for tagged versions
sysmoOCTSIM-*-*.bin only works if the build is not a version that was
just tagged. In that case the file name is sysmoOCTSIM-0.3.bin which
doesn't match the above pattern as it has no git hash appended.
Change-Id: I4927f24407a25c87ca59f6230d64d24761558c18
---
M contrib/jenkins.sh
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 961acf1..9111965 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -71,7 +71,7 @@
[ftp.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX
EOF
SSH_COMMAND="ssh -o 'UserKnownHostsFile=/build/known_hosts' -p 48"
- LATEST_BIN="$(cd "$TOPDIR"/sysmoOCTSIM/gcc/; ls -1 sysmoOCTSIM-*-*.bin)"
+ LATEST_BIN="$(cd "$TOPDIR"/sysmoOCTSIM/gcc/; ls -1 sysmoOCTSIM-*.bin)"
echo "LATEST_BIN: $LATEST_BIN"
--
To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39792?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ccid-firmware
Gerrit-Branch: master
Gerrit-Change-Id: I4927f24407a25c87ca59f6230d64d24761558c18
Gerrit-Change-Number: 39792
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39786?usp=email )
Change subject: gcc/Makefile: fail early if xxd is not installed
......................................................................
gcc/Makefile: fail early if xxd is not installed
Since aaec8734 ("add fw update crcstub") the xxd program is required for
running the Makefile.
Change-Id: I6a3e7021929ba58c14f1ffced5702d2dfa839ebe
---
M gcc/Makefile
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/gcc/Makefile b/gcc/Makefile
index b5d3cf0..27a9143 100644
--- a/gcc/Makefile
+++ b/gcc/Makefile
@@ -13,6 +13,10 @@
MK_DIR = mkdir -p
+ifeq (, $(shell which xxd))
+$(error missing required program "xxd")
+endif
+
OBJS += \
hal/src/hal_io.o \
hpl/core/hpl_core_m4.o \
--
To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39786?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-asf4-dfu
Gerrit-Branch: master
Gerrit-Change-Id: I6a3e7021929ba58c14f1ffced5702d2dfa839ebe
Gerrit-Change-Number: 39786
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>