Skip to content
This repository has been archived by the owner on Nov 14, 2024. It is now read-only.

Fix CI and compliance errors #157

Merged
merged 3 commits into from
Feb 29, 2024
Merged

Fix CI and compliance errors #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35761b6
[nrf noup] ci: Fix the path for running compliance
krish2718 Feb 26, 2024
1bd5986
[nrf noup] zephyr: Fix checkpatch warnings
krish2718 Feb 29, 2024
ce11143
[nrf noup] zephyr: Fix checkpatch warnings
krish2718 Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions .github/workflows/compliance.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,30 +59,31 @@ jobs:
id: compliance
env:
BASE_REF: ${{ github.base_ref }}
working-directory: sdk-zephyr
if: contains(github.event.pull_request.user.login, 'dependabot[bot]') != true
run: |
export ZEPHYR_BASE="$(dirname "$(pwd)")/sdk-zephyr"
export ZEPHYR_BASE="$(dirname "$(pwd)")/sdk-hostap/sdk-zephyr"
# debug
ls -la
git log --pretty=oneline | head -n 10
./scripts/ci/check_compliance.py --annotate -e gitlint -e KconfigBasic -e Kconfig \
-e ModulesMaintainers -c origin/${BASE_REF}..
$ZEPHYR_BASE/scripts/ci/check_compliance.py --annotate -e ModulesMaintainers -e KconfigBasicNoModules -e KconfigBasic -e Kconfig \
-c origin/${BASE_REF}..

- name: upload-results
uses: actions/upload-artifact@v3
continue-on-error: true
if: contains(github.event.pull_request.user.login, 'dependabot[bot]') != true
with:
name: compliance.xml
path: sdk-zephyr/compliance.xml
path: sdk-hostap

- name: check-warns
if: contains(github.event.pull_request.user.login, 'dependabot[bot]') != true
run: |
echo $(pwd)
ls -la
export ZEPHYR_BASE="$(dirname "$(pwd)")/sdk-hostap/sdk-zephyr"
if [[ ! -s $ZEPHYR_BASE/"compliance.xml" ]]; then
echo "::error ::compliance.xml not found in $ZEPHYR_BASE"
if [[ ! -s $(dirname "$(pwd)")/sdk-hostap/compliance.xml ]]; then
echo "::error ::compliance.xml not found in $(dirname "$(pwd)")/sdk-hostap/compliance.xml"
exit 1;
fi

Expand Down
12 changes: 8 additions & 4 deletions src/drivers/driver_zephyr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,8 @@ void wpa_supplicant_event_wrapper(void *ctx,
return;
}

os_memcpy(req_ies, data->assoc_info.req_ies, data->assoc_info.req_ies_len);
os_memcpy(req_ies, data->assoc_info.req_ies,
data->assoc_info.req_ies_len);
data_tmp->assoc_info.req_ies = req_ies;
}
if (data->assoc_info.resp_ies) {
Expand All @@ -124,7 +125,8 @@ void wpa_supplicant_event_wrapper(void *ctx,
return;
}

os_memcpy(resp_ies, data->assoc_info.resp_ies, data->assoc_info.resp_ies_len);
os_memcpy(resp_ies, data->assoc_info.resp_ies,
data->assoc_info.resp_ies_len);
data_tmp->assoc_info.resp_ies = resp_ies;
}
if (data->assoc_info.resp_frame) {
Expand All @@ -136,7 +138,8 @@ void wpa_supplicant_event_wrapper(void *ctx,
return;
}

os_memcpy(resp_frame, data->assoc_info.resp_frame, data->assoc_info.resp_frame_len);
os_memcpy(resp_frame, data->assoc_info.resp_frame,
data->assoc_info.resp_frame_len);
data_tmp->assoc_info.resp_frame = resp_frame;
}
} else if (event == EVENT_ASSOC_REJECT) {
Expand All @@ -161,7 +164,8 @@ void wpa_supplicant_event_wrapper(void *ctx,
return;
}

os_memcpy(resp_ies, data->assoc_reject.resp_ies, data->assoc_reject.resp_ies_len);
os_memcpy(resp_ies, data->assoc_reject.resp_ies,
data->assoc_reject.resp_ies_len);
data_tmp->assoc_reject.resp_ies = resp_ies;
}
} else if (event == EVENT_DEAUTH) {
Expand Down
Loading