diff --git a/.github/workflows/GPT.yml b/.github/workflows/GPT.yml
new file mode 100644
index 0000000000..b5c49223a9
--- /dev/null
+++ b/.github/workflows/GPT.yml
@@ -0,0 +1,24 @@
+name: Code Review
+
+permissions:
+ contents: read
+ pull-requests: write
+
+on:
+ pull_request:
+ types:
+ - review_requested
+
+jobs:
+ review_full:
+ if: github.event.action == 'review_requested' && github.event.requested_reviewer.login == 'Nordicbuilder'
+ runs-on: ubuntu-latest
+ steps:
+ - name: Full PR Diff Review
+ uses: NordicBuilder/ChatGPT-CodeReview@takeAllCommits
+ env:
+ GITHUB_TOKEN: ${{ secrets.NORDICBUILDER_GPT }}
+ OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+ # PROMPT: "Review the pull request diff. If you find any issues, list them as bullet points with one sentence each. Do not add any extra commentary, preamble, or closing remarks. If there are no issues, output nothing."
+ IGNORE_PATTERNS: /dummy_modules/**/*,dummy.md
+ INCLUDE_PATTERNS: "*.*"
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
deleted file mode 100644
index e986738ffb..0000000000
--- a/.github/workflows/backport.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Backport
-on:
- pull_request_target:
- types:
- - closed
- - labeled
- branches:
- - main
-
-jobs:
- backport:
- name: Backport
- runs-on: ubuntu-22.04
- # Only react to merged PRs for security reasons.
- # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
- if: >
- github.event.pull_request.merged &&
- (
- github.event.action == 'closed' ||
- (
- github.event.action == 'labeled' &&
- contains(github.event.label.name, 'backport')
- )
- )
- steps:
- - name: Backport
- uses: zephyrproject-rtos/action-backport@v2.0.3-3
- with:
- github_token: ${{ secrets.NCS_GITHUB_TOKEN }}
- issue_labels: Backport
- labels_template: '["Backport"]'
diff --git a/.github/workflows/compliance.yml b/.github/workflows/compliance.yml
deleted file mode 100644
index 99e8fd99bf..0000000000
--- a/.github/workflows/compliance.yml
+++ /dev/null
@@ -1,108 +0,0 @@
-name: Compliance
-
-on: pull_request
-
-jobs:
- compliance_job:
- runs-on: ubuntu-latest
- name: Run compliance checks on patch series (PR)
- steps:
- - name: Update PATH for west
- run: |
- echo "$HOME/.local/bin" >> $GITHUB_PATH
-
- - name: Checkout sources
- uses: nrfconnect/action-checkout-west-update@main
- with:
- git-fetch-depth: 0
- git-ref: ${{ github.event.pull_request.head.sha }}
-
- - name: cache-pip
- uses: actions/cache@v3
- with:
- path: ~/.cache/pip
- key: ${{ runner.os }}-doc-pip
-
- - name: Install python dependencies
- working-directory: ncs/nrf
- run: |
- pip3 install -U pip
- pip3 install -U setuptools
- pip3 install -U wheel
- grep -E "^python-magic=|^junitparser|^lxml|^gitlint|^pylint|^pykwalify|^yamllint|^unidiff" scripts/requirements-fixed.txt | cut -d ' ' -f '1' | xargs pip3 install -U
- grep -E "^west" scripts/requirements-fixed.txt | cut -d ' ' -f '1' | xargs pip3 install -U
- pip3 show -f west
-
- - name: Run merge commits test
- env:
- BASE_REF: ${{ github.base_ref }}
- working-directory: ncs/nrf
- run: |
- git remote -v
- # Ensure there's no merge commits in the PR
- [[ "$(git rev-list --merges --count origin/${BASE_REF}..)" == "0" ]] || \
- (echo "::error ::Merge commits not allowed, rebase instead";false)
-
- git rebase origin/${BASE_REF}
- # debug
- git log --pretty=oneline | head -n 10
-
- - name: Run CODEOWNERS test
- id: codeowners
- env:
- BASE_REF: ${{ github.base_ref }}
- working-directory: ncs/nrf
- if: contains(github.event.pull_request.user.login, 'dependabot[bot]') != true
- run: |
- ./scripts/ci/codeowners.py -c origin/${BASE_REF}..
-
- - name: Run Compliance Tests
- continue-on-error: true
- id: compliance
- env:
- BASE_REF: ${{ github.base_ref }}
- working-directory: ncs/nrf
- if: contains(github.event.pull_request.user.login, 'dependabot[bot]') != true
- run: |
- export ZEPHYR_BASE="$(dirname "$(pwd)")/zephyr"
- # debug
- ls -la
- git log --pretty=oneline | head -n 10
- # For now we run KconfigBasic, but we should transition to Kconfig
- $ZEPHYR_BASE/scripts/ci/check_compliance.py --annotate -e Kconfig \
- -e KconfigBasicNoModules -e ClangFormat -c origin/${BASE_REF}..
-
- - name: upload-results
- uses: actions/upload-artifact@v4
- continue-on-error: true
- if: contains(github.event.pull_request.user.login, 'dependabot[bot]') != true
- with:
- name: compliance.xml
- path: ncs/nrf/compliance.xml
- overwrite: true
-
- - name: check-warns
- working-directory: ncs/nrf
- if: contains(github.event.pull_request.user.login, 'dependabot[bot]') != true
- run: |
- export ZEPHYR_BASE="$(dirname "$(pwd)")/zephyr"
- if [[ ! -s "compliance.xml" ]]; then
- exit 1;
- fi
-
- files=($($ZEPHYR_BASE/scripts/ci/check_compliance.py -l))
- for file in "${files[@]}"; do
- f="${file}.txt"
- if [[ -s $f ]]; then
- errors=$(cat $f)
- errors="${errors//'%'/'%25'}"
- errors="${errors//$'\n'/'%0A'}"
- errors="${errors//$'\r'/'%0D'}"
- echo "::error file=${f}::$errors"
- exit=1
- fi
- done
-
- if [ "${exit}" == "1" ]; then
- exit 1;
- fi
diff --git a/.github/workflows/contribs.yml b/.github/workflows/contribs.yml
deleted file mode 100644
index 67dc5ed61e..0000000000
--- a/.github/workflows/contribs.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Contribs
-on:
- pull_request_target:
- types: [opened, reopened]
-
-jobs:
- contribs:
- runs-on: ubuntu-latest
- name: Contribs
- steps:
- - name: Contribs
- uses: carlescufi/action-contribs@main
- with:
- github-token: ${{ secrets.NCS_GITHUB_TOKEN }}
- command: 'external'
- messages: |
- Thank you for your contribution!
- It seems you are not a member of the nrfconnect GitHub organization. External contributions are handled as follows:
- Large contributions, affecting multiple subsystems for example, may be rejected if they are complex, may introduce regressions due to lack of test coverage, or if they are not consistent with the architecture of nRF Connect SDK.
- PRs will be run in our continuous integration (CI) test system.
- If CI passes, PRs will be tagged for review and merged on successful completion of review. You may be asked to make some modifications to your contribution during review.
- If CI fails, PRs may be rejected or may be tagged for review and rework.
- PRs that become outdated due to other changes in the repository may be rejected or rework requested.
- External contributions will be prioritized for review based on the relevance to current development efforts in nRF Connect SDK. Bug fix PRs will be prioritized.
- You may raise issues or ask for help from our Technical Support team by visiting https://devzone.nordicsemi.com/.
- |
- The author of this pull request has now been added to the nrfconnect GitHub organization.
- labels: 'external'
diff --git a/.github/workflows/create-upmerge-PRs.yml b/.github/workflows/create-upmerge-PRs.yml
deleted file mode 100644
index d2f57f9ed6..0000000000
--- a/.github/workflows/create-upmerge-PRs.yml
+++ /dev/null
@@ -1,112 +0,0 @@
-name: Zephyr upmerge
-
-# on:
-# schedule:
-# - cron: "0 0 * * *"
-on: workflow_dispatch
-
-env:
- GH_TOKEN: ${{ secrets.NCS_GITHUB_UPMERGE_TOKEN }}
- ZEPHYR_UPSTREAM: https://github.com/zephyrproject-rtos/zephyr
- MCUBOOT_UPSTREAM: https://github.com/zephyrproject-rtos/mcuboot
- PR_TARGET_BRANCH: upmerge-tmp
-
-jobs:
- auto-upmerge-create-PRs:
- if: github.repository == 'nrfconnect/sdk-nrf'
- runs-on: ubuntu-latest
- steps:
- - name: Checkout sources
- uses: nrfconnect/action-checkout-west-update@main
- with:
- git-fetch-depth: 0
- west-update-args: 'zephyr bsim mcuboot'
-
- - name: Install base dependencies
- working-directory: ncs
- run: |
- pip3 install -r nrf/scripts/requirements-base.txt
- pip3 install -r nrf/scripts/requirements-extra.txt
-
- - name: Get repo urls
- working-directory: ncs
- run: |
- echo "SDK_ZEPHYR=$(west list zephyr -f {url} | awk -F// '{print $NF}')" >> $GITHUB_ENV
- echo "SDK_MCUBOOT=$(west list mcuboot -f {url} | awk -F// '{print $NF}')" >> $GITHUB_ENV
-
- - name: Try closing existing auto-upmerge PRs
- run: |
- SDK_ZEPHYR_PR=$(gh pr list --repo $SDK_ZEPHYR --label "auto-upmerge" --json number --jq .[0].number)
- gh pr close $SDK_ZEPHYR_PR --repo $SDK_ZEPHYR | true
- SDK_MCUBOOT_PR=$(gh pr list --repo $SDK_MCUBOOT --label "auto-upmerge" --json number --jq .[0].number)
- gh pr close $SDK_MCUBOOT_PR --repo $SDK_MCUBOOT | true
- SDK_NRF_PR=$(gh pr list --repo $GITHUB_SERVER_URL/$GITHUB_REPOSITORY --label "auto-upmerge" --json number --jq .[0].number)
- gh pr close $SDK_NRF_PR --repo $GITHUB_SERVER_URL/$GITHUB_REPOSITORY | true
-
- - name: Run ncs-upmerge and create sdk-zephyr upmerge PR
- working-directory: ncs/zephyr
- run: |
- git remote add -f upstream $ZEPHYR_UPSTREAM && git remote add -f origin https://nordicbuilder:${{secrets.NCS_GITHUB_UPMERGE_TOKEN}}@$SDK_ZEPHYR
- git checkout -b upmerge_local
- west ncs-upmerger zephyr
- git push origin upmerge_local:auto-upmerge/$GITHUB_RUN_ID -u
- MCUBOOT_UPSTREAM_REV=$(cat west.yml | awk -e '/- name: mcuboot/,/path: bootloader\/mcuboot/ { if ($0 ~ "revision:.*") { print $2; }; }')
-
- UPSTREAMHASH=$(git rev-parse --short upstream/main)
- ZEPHYR_PR_URL=$(gh pr create --base $PR_TARGET_BRANCH --title "[nrf mergeup] Merge upstream automatically up to commit $UPSTREAMHASH" --body "Automatic upmerge action" --repo $SDK_ZEPHYR --label "auto-upmerge")
- echo "ZEPHYR_PR_URL=$ZEPHYR_PR_URL" >> $GITHUB_ENV
- echo "Created PR: $ZEPHYR_PR_URL"
- echo "MCUboot revision used by upstream: ${MCUBOOT_UPSTREAM_REV}"
- echo "MCUBOOT_UPSTREAM_REV=${MCUBOOT_UPSTREAM_REV}" >> $GITHUB_ENV
-
- - name: Run ncs-upmerge and create sdk-mcuboot upmerge PR
- working-directory: ncs/bootloader/mcuboot
- run: |
- git remote add -f upstream $MCUBOOT_UPSTREAM && git remote add -f origin https://nordicbuilder:${{secrets.NCS_GITHUB_UPMERGE_TOKEN}}@$SDK_MCUBOOT
- git checkout -b upmerge_local
- west ncs-upmerger mcuboot
- git push origin upmerge_local:auto-upmerge/$GITHUB_RUN_ID -u
-
- UPSTREAMHASH=${MCUBOOT_UPSTREAM_REV}
- MCUBOOT_PR_URL=$(gh pr create --base $PR_TARGET_BRANCH --title "[nrf mergeup] Merge upstream automatically up to commit $UPSTREAMHASH" --body "Automatic upmerge action" --repo $SDK_MCUBOOT --label "auto-upmerge")
- echo "MCUBOOT_PR_URL=$MCUBOOT_PR_URL" >> $GITHUB_ENV
- echo "Created PR: $MCUBOOT_PR_URL"
-
-
- - name: create sdk-nrf PR with updated west.yml
- working-directory: ncs/nrf
- run: |
- NEW_REV=$(echo "pull/$(basename $ZEPHYR_PR_URL)/head" | sed 's/\//\\\//g')
- NEW_MCUBOOT_REV=$(echo "pull/$(basename $MCUBOOT_PR_URL)/head" | sed 's/\//\\\//g')
- OLD_REV=$(west list zephyr -f {revision})
- OLD_MCUBOOT_REV=$(west list mcuboot -f {revision})
- git checkout -b upmerge_local
- sed -i "s/revision: $OLD_REV/revision: $NEW_REV/" west.yml
- sed -i "s/revision: $OLD_MCUBOOT_REV/revision: $NEW_MCUBOOT_REV/" west.yml
- git commit -a -m "manifest: Update sdk-zephyr revision (automatic Zephyr upmerge)" -m "Automatically created by Github Action" --signoff
- git push origin upmerge_local:auto-upmerge/$GITHUB_RUN_ID -u
- gh pr create --base $PR_TARGET_BRANCH --title "manifest: Update revisions of upmerged projects (automatic upmerge)" --body "Automatic upmerge action" --label "CI-all-test" --label "auto-upmerge"
-
- failure-notifier:
- runs-on: ubuntu-latest
- if: failure()
- needs: auto-upmerge-create-PRs
- env:
- MESSAGE: "Zephyr auto-upmerge workflow has failed.
Please check action output for details: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
- steps:
- - name: Add summary (steps to reproduce)
- run: |
- echo "### :boom:Automatic zephyr upmerge action has failed :boom:" >> $GITHUB_STEP_SUMMARY
- echo "#### In case of e.g. merge conflict you can reproduce it locally with the following steps:" >> $GITHUB_STEP_SUMMARY
- echo "\`\`\`sh" >> $GITHUB_STEP_SUMMARY
- echo "west init -l nrf" >> $GITHUB_STEP_SUMMARY
- echo "west update zephyr" >> $GITHUB_STEP_SUMMARY
- echo "cd zephyr" >> $GITHUB_STEP_SUMMARY
- echo "git remote add -f upstream https://github.com/zephyrproject-rtos/zephyr" >> $GITHUB_STEP_SUMMARY
- echo "west ncs-upmerger zephyr" >> $GITHUB_STEP_SUMMARY
- echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
- echo "Solve merge-conflict locally and submit sdk-zephyr and sdk-nrf PRs" >> $GITHUB_STEP_SUMMARY
-
- - name: Send MS Teams notification
- run: |
- curl -s ${{ secrets.CONNECTOR_TEAMS_NCS_UPMERGE }} -X POST -H 'Content-type: application/json' --data '{"text": "'"$MESSAGE"'"}'
diff --git a/.github/workflows/dnm.yml b/.github/workflows/dnm.yml
deleted file mode 100644
index 783229b652..0000000000
--- a/.github/workflows/dnm.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: Do Not Merge
-
-on:
- pull_request:
- types: [synchronize, opened, reopened, labeled, unlabeled]
-
-jobs:
- do-not-merge:
- if: ${{ contains(github.event.*.labels.*.name, 'DNM') }}
- name: Prevent Merging
- runs-on: ubuntu-latest
- steps:
- - name: Check for label
- run: |
- echo "Pull request is labeled as 'DNM'"
- echo "This workflow fails so that the pull request cannot be merged"
- exit 1
diff --git a/.github/workflows/docbuild.yml b/.github/workflows/docbuild.yml
deleted file mode 100644
index 3ca9e31179..0000000000
--- a/.github/workflows/docbuild.yml
+++ /dev/null
@@ -1,190 +0,0 @@
-name: Documentation Build
-
-on:
- pull_request:
- types: [opened, synchronize, reopened]
- branches:
- - main
- - 'v*-branch'
- paths:
- - '.github/workflows/docbuild.yml'
- - '**.rst'
- - '**/Kconfig'
- - '**/sample.yaml'
- - 'doc/**'
- - 'applications/**'
- - 'include/**'
- - 'lib/**'
- - 'doc/requirements.txt'
- - 'scripts/tools-versions-*.yml'
- - 'west.yml'
- push:
- branches:
- - main
- - 'v*-branch'
- tags:
- - v*
-
-jobs:
- build:
- runs-on: ubuntu-latest
- concurrency:
- group: ${{ github.workflow }}-${{ github.ref }}
- cancel-in-progress: true
- steps:
- - name: Checkout sources
- uses: nrfconnect/action-checkout-west-update@main
-
- - name: cache-pip
- uses: actions/cache@v4
- with:
- path: ~/.cache/pip
- key: ${{ runner.os }}-doc-pip
-
- - name: Install packages
- run: |
- sudo apt update
- sudo apt-get install -y ninja-build mscgen plantuml
- sudo snap install yq
- DOXYGEN_VERSION=$(yq ".doxygen.version" ./ncs/nrf/scripts/tools-versions-linux.yml)
- wget --no-verbose "https://github.com/doxygen/doxygen/releases/download/Release_${DOXYGEN_VERSION//./_}/doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz"
- tar xf doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz
- echo "${PWD}/doxygen-${DOXYGEN_VERSION}/bin" >> $GITHUB_PATH
-
- - name: Install Python dependencies
- working-directory: ncs
- run: |
- sudo pip3 install -U setuptools wheel pip
- pip3 install -r nrf/doc/requirements.txt
-
- - name: West zephyr-export
- working-directory: ncs
- run: |
- west zephyr-export
-
- - name: Build documentation
- working-directory: ncs/nrf
- run: |
- if [[ "${{ github.event_name }}" == "pull_request" ]]; then
- BUILD_CONF="-DNO_DTS_BINDINGS=ON"
- fi
-
- cmake -GNinja -Bdoc/_build -Sdoc -DSPHINXOPTS_EXTRA="-q" ${BUILD_CONF}
- ninja -C doc/_build
-
- - name: Check version
- run: |
- VERSION_REGEX="^v([0-9a-z\.\-]+)$"
- if [[ ${GITHUB_REF#refs/tags/} =~ $VERSION_REGEX ]]; then
- VERSION=${BASH_REMATCH[1]}
- elif [[ ${GITHUB_REF#refs/heads/} == "main" ]]; then
- VERSION="latest"
- elif [[ "${{ github.event_name }}" == "pull_request" ]]; then
- VERSION="pr-${{ github.event.number }}"
- fi
-
- echo "VERSION=${VERSION}" >> $GITHUB_ENV
-
- - name: Prepare legacy upload
- if: ${{ !contains(github.event.pull_request.labels.*.name, 'external') || contains(github.event.pull_request.labels.*.name, 'CI-trusted-author') }}
- working-directory: ncs/nrf
- run: |
- MONITOR="monitor_${{ github.run_id }}.txt"
-
- # Create documentation upload files
- if [[ "${{ github.event_name }}" == "pull_request" ]]; then
- ARCHIVE="legacy-ncs-pr-${{ github.event.number }}.zip"
- echo "publish2 dev PR-${{ github.event.number }} ${ARCHIVE}" > "${MONITOR}"
- echo "${{ github.event.number }}" > pr.txt
- else
- if [ -z "${VERSION}" ]; then
- echo "Not a release or latest, skipping publish"
- exit 0
- fi
-
- ARCHIVE="legacy-ncs-${VERSION}.zip"
- echo "publish2 main ${VERSION} ${ARCHIVE}" > "${MONITOR}"
- fi
-
- cd doc/_build/html
- zip -rq "${ARCHIVE}" .
- mv "${ARCHIVE}" ../../../
-
- - name: Prepare Zoomin upload
- if: ${{ !contains(github.event.pull_request.labels.*.name, 'external') || contains(github.event.pull_request.labels.*.name, 'CI-trusted-author') }}
- working-directory: ncs/nrf
- run: |
- ROOT="$PWD"
-
- # Doxygen APIs combined with Sphinx
- declare -a SPHINX_DOXYGEN=("nrf" "nrfxlib" "zephyr")
-
- mkdir doc/_build/html-doxygen
-
- for docset in "${SPHINX_DOXYGEN[@]}"; do
- OUTDIR=doc/_build/html-doxygen/$docset-apis
- mv doc/_build/html/$docset/doxygen/html "$OUTDIR"
-
- # Populate custom.properties, tags.yml
- cp doc/_zoomin/$docset.apis.custom.properties "$OUTDIR/custom.properties"
- sed -i 's/__VERSION__/'"$VERSION"'/g' "$OUTDIR/custom.properties"
-
- cp doc/_zoomin/$docset.apis.tags.yml "$OUTDIR/tags.yml"
- sed -i 's/__VERSION__/'"$VERSION"'/g' "$OUTDIR/tags.yml"
-
- # Patch links from Sphinx to Doxygen APIs
- find doc/_build/html/$docset -type f -name "*.html" -exec \
- sed -ri "/href=\"(.*)\/doxygen\/html\/(.*)\"/{s//href=\"\1\/..\/..\/..\/$docset-apis-$VERSION\/page\/\2\"/; :a s/__/_/;ta; }" {} \;
-
- pushd "$OUTDIR"
- ARCHIVE="$docset-apis-$VERSION.zip"
- zip -rq "$ARCHIVE" .
- mv "$ARCHIVE" "$ROOT"
- popd
- done
-
- # Doxygen APIs standalone
- declare -a DOXYGEN=("nrfx")
-
- for docset in "${DOXYGEN[@]}"; do
- OUTDIR=doc/_build/html-doxygen/$docset-apis
- mv doc/_build/html/$docset "$OUTDIR"
-
- # Populate custom.properties, tags.yml
- cp doc/_zoomin/$docset.apis.custom.properties "$OUTDIR/custom.properties"
- sed -i 's/__VERSION__/'"$VERSION"'/g' "$OUTDIR/custom.properties"
-
- cp doc/_zoomin/$docset.apis.tags.yml "$OUTDIR/tags.yml"
- sed -i 's/__VERSION__/'"$VERSION"'/g' "$OUTDIR/tags.yml"
-
- pushd "$OUTDIR"
- ARCHIVE="$docset-apis-$VERSION.zip"
- zip -rq "$ARCHIVE" .
- mv "$ARCHIVE" "$ROOT"
- popd
- done
-
- # NCS
- OUTDIR=doc/_build/html
-
- # Populate custom.properties, tags.yml
- cp doc/_zoomin/ncs.custom.properties "$OUTDIR/custom.properties"
- sed -i 's/__VERSION__/'"$VERSION"'/g' "$OUTDIR/custom.properties"
-
- cp doc/_zoomin/ncs.tags.yml "$OUTDIR/tags.yml"
- sed -i 's/__VERSION__/'"$VERSION"'/g' "$OUTDIR/tags.yml"
-
- ARCHIVE="ncs-$VERSION.zip"
- pushd "$OUTDIR"
- zip -rq "$ARCHIVE" .
- mv "$ARCHIVE" "$ROOT"
- popd
- - name: Store
- if: ${{ !contains(github.event.pull_request.labels.*.name, 'external') || contains(github.event.pull_request.labels.*.name, 'CI-trusted-author') }}
- uses: actions/upload-artifact@v4
- with:
- name: docs
- path: |
- ncs/nrf/*.zip
- ncs/nrf/monitor*.txt
- ncs/nrf/pr.txt
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
deleted file mode 100644
index 5fee41d65f..0000000000
--- a/.github/workflows/docker.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Build and Push Docker Image
-
-on:
- push:
- tags:
- - 'v*'
-
-jobs:
- build:
- runs-on: ubuntu-latest
-
- steps:
- - name: Checkout repository
- uses: actions/checkout@v3
-
- - name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v3
-
- - name: Login to GitHub Container Registry
- uses: docker/login-action@v3
- with:
- registry: ghcr.io
- username: NordicBuilder
- password: ${{ secrets.NCS_GITHUB_PKG_WRITE_TOKEN }}
-
- - name: Build and push Docker image
- run: |
- TOOLCHAIN_ID=$(../print_toolchain_checksum.sh)
- docker build -t ghcr.io/${{ github.repository }}-toolchain:${{ github.ref_name }} --build-arg VERSION=$TOOLCHAIN_ID .
- docker push ghcr.io/${{ github.repository }}-toolchain:${{ github.ref_name }}
- working-directory: scripts/docker
diff --git a/.github/workflows/docpublish.yml b/.github/workflows/docpublish.yml
deleted file mode 100644
index 868f5fc4ed..0000000000
--- a/.github/workflows/docpublish.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-name: Documentation Publish
-
-on:
- workflow_run:
- workflows: ["Documentation Build"]
- types:
- - completed
-
-jobs:
- publish:
- runs-on: ubuntu-latest
- if: ${{ github.event.workflow_run.conclusion == 'success' }}
- steps:
- - name: Download artifacts
- uses: dawidd6/action-download-artifact@v6
- with:
- workflow: docbuild.yml
- run_id: ${{ github.event.workflow_run.id }}
-
- - name: Unzip html archive
- working-directory: docs
- run: |
- OUTDIR=$(awk 'NR==1 { if ($3 ~ /^(latest|v([0-9a-z\.\-]+)|PR-[0-9]+)$/) print $3 }' monitor_*.txt)
- echo "OUTDIR=$OUTDIR" >> "$GITHUB_ENV"
- unzip legacy-ncs*.zip -d $OUTDIR
-
- - name: Upload to Azure storage
- working-directory: docs
- env:
- AZCOPY_CONCURRENCY_VALUE: 1024
- run: |
- azcopy cp $OUTDIR "${{ vars.NCS_DOC_STORAGE_URL }}?${{ secrets.NCS_DOC_SAS}}" --recursive=true
-
- - name: Upload Zoomin documentation
- run: |
- for file in docs/monitor*.txt; do
- if ! grep -q main ${file}; then
- echo "Not targeting main, skipping Zoomin upload"
- exit 0
- fi
- done
-
- # trust server
- mkdir -p ~/.ssh
- ssh-keyscan upload-v1.zoominsoftware.io >> ~/.ssh/known_hosts
-
- # prepare key
- echo "${{ secrets.NCS_ZOOMIN_KEY }}" | base64 -d > zoomin_key
- chmod 600 zoomin_key
-
- # upload files
- for file in docs/*-apis-*.zip; do
- sftp -v -i zoomin_key nordic@upload-v1.zoominsoftware.io <> $GITHUB_ENV
- # debug
- ( cd ${{ inputs.path }}; echo "${{ inputs.path }}"; git log --pretty=oneline --max-count=10 )
- ( cd nrf; echo "nrf"; git log --pretty=oneline --max-count=10 )
- ( cd zephyr; echo "zephyr"; git log --pretty=oneline --max-count=10 )
-
- - name: Install license check script dependencies
- run: |
- pip3 install -U -r ncs/nrf/scripts/ci/requirements.txt
-
- - name: Run license checks
- id: license_checks
- env:
- BASE_REF: ${{ github.base_ref }}
- ZEPHYR_BASE: ${{ env.ZEPHYR_BASE }}
- working-directory: ncs/${{ inputs.path }}
- if: contains(github.event.pull_request.user.login, 'dependabot[bot]') != true
- run: |
- export PATH="$HOME/.local/bin:$PATH"
- export PATH="$HOME/bin:$PATH"
- ${ZEPHYR_BASE}/../nrf/scripts/ci/check_license.py \
- --github \
- -l ${ZEPHYR_BASE}/../${{ inputs.license_allow_list }} \
- -c origin/${BASE_REF}..
-
- - name: Upload results
- uses: actions/upload-artifact@v4
- continue-on-error: true
- if: always() && contains(github.event.pull_request.user.login, 'dependabot[bot]') != true
- with:
- name: licenses.xml
- path: ncs/${{ inputs.path }}/licenses.xml
- overwrite: true
diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml
deleted file mode 100644
index 2c0a3ca640..0000000000
--- a/.github/workflows/license.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-name: License Check
-
-on: pull_request
-
-jobs:
- call-workflow:
- uses: ./.github/workflows/license-reusable.yml
- with:
- path: nrf
diff --git a/.github/workflows/manifest.yml b/.github/workflows/manifest.yml
deleted file mode 100644
index ff519bc4b7..0000000000
--- a/.github/workflows/manifest.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: Manifest
-on: pull_request_target
-
-permissions:
- contents: read
- pull-requests: write
-
-jobs:
- manifest:
- runs-on: ubuntu-latest
- name: Manifest
- steps:
- - name: Checkout the code
- uses: actions/checkout@v4
- with:
- path: ncs/nrf
- ref: ${{ github.event.pull_request.head.sha }}
- fetch-depth: 0
- persist-credentials: false
-
- - name: west setup
- env:
- BASE_REF: ${{ github.base_ref }}
- working-directory: ncs/nrf
- run: |
- pip3 install west
- git config --global user.email "you@example.com"
- git config --global user.name "Your Name"
- west init -l . || true
- # We only import the zephyr manifest
- west update zephyr
-
- - name: Manifest
- uses: zephyrproject-rtos/action-manifest@v1.6.0
- with:
- github-token: ${{ secrets.NCS_GITHUB_TOKEN }}
- manifest-path: 'west.yml'
- checkout-path: 'ncs/nrf'
- use-tree-checkout: 'true'
- west-import-flag: 'self'
- check-impostor-commits: 'true'
- label-prefix: 'manifest-'
- verbosity-level: '1'
- labels: 'manifest'
- dnm-labels: 'DNM'
diff --git a/.github/workflows/openai.yml b/.github/workflows/openai.yml
deleted file mode 100644
index 9244ff92e9..0000000000
--- a/.github/workflows/openai.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: AI Code Reviewer
-
-on:
- pull_request:
- types:
- - opened
- - synchronize
-permissions: write-all
-jobs:
- review:
- runs-on: ubuntu-latest
- steps:
- - name: Checkout Repo
- uses: actions/checkout@v3
-
- - name: AI Code Reviewer
- uses: aidar-freeed/ai-codereviewer@main
- with:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # The GITHUB_TOKEN is there by default so you just need to keep it like it is and not necessarily need to add it as secret as it will throw an error. [More Details](https://docs.github.com/en/actions/security-guides/automatic-token-authentication#about-the-github_token-secret)
- OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
- OPENAI_API_MODEL: "gpt-4" # Optional: defaults to "gpt-4"
- #exclude: "**/*.json, **/*.md" # Optional: exclude patterns separated by commas
\ No newline at end of file
diff --git a/.github/workflows/oss-history.yml b/.github/workflows/oss-history.yml
deleted file mode 100644
index ee730c4910..0000000000
--- a/.github/workflows/oss-history.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: OSS history check
-on: pull_request
-
-jobs:
- contribs:
- runs-on: ubuntu-latest
- name: Check OSS history
- steps:
- - name: Checkout sources
- uses: nrfconnect/action-checkout-west-update@main
- with:
- git-fetch-depth: 0
- west-update-args: ''
-
- - name: Install extra python dependencies
- run: |
- pip3 install --upgrade pip setuptools west
- pip3 install -r ncs/nrf/scripts/requirements-extra.txt
-
- - name: Set upsteam
- working-directory: ncs
- run: |
- git -C zephyr remote add upstream https://github.com/zephyrproject-rtos/zephyr
-
- - name: Check manifest userdata
- working-directory: ncs/nrf
- run: |
- python3 scripts/ci/check_manifest_userdata.py
-
- - name: Check OSS history
- uses: nrfconnect/action-oss-history@main
- with:
- workspace: 'ncs'
- args: -p zephyr -p mcuboot -p hostap -p wfa-qt-control-app
diff --git a/.github/workflows/reapply-ci-trusted-author.yml b/.github/workflows/reapply-ci-trusted-author.yml
deleted file mode 100644
index cfc6e7e429..0000000000
--- a/.github/workflows/reapply-ci-trusted-author.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Reapply CI-trusted-author label
-# We want to use NordicBuilder instead of github-actions[bot] user
-# github-actions[bot] is not trusted collaborator and labels added by it does not trigger Jenkins builds
-
-on:
- pull_request_target:
- types: [opened, reopened, synchronize]
-
-jobs:
- reapply_label:
- name: Reapply label
- if: ${{ contains(github.event.*.labels.*.name, 'CI-trusted-author') }}
- runs-on: ubuntu-latest
- steps:
- - name: Remove CI-trusted-author label
- run: gh pr edit ${{ github.event.pull_request.number }} --remove-label "CI-trusted-author"
- env:
- GH_TOKEN: ${{ secrets.NCS_JENKINS_TOKEN }}
- GH_REPO: ${{ github.repository }}
-
- - name: Add CI-trusted-author label
- run: gh pr edit ${{ github.event.pull_request.number }} --add-label "CI-trusted-author"
- env:
- GH_TOKEN: ${{ secrets.NCS_JENKINS_TOKEN }}
- GH_REPO: ${{ github.repository }}
diff --git a/.github/workflows/remove-ci-requested.yml b/.github/workflows/remove-ci-requested.yml
deleted file mode 100644
index dd7549ba9e..0000000000
--- a/.github/workflows/remove-ci-requested.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: Remove CI-Requested label
-
-on:
- pull_request_target:
- types: [opened, reopened, synchronize]
-
-jobs:
- remove_label:
- name: Remove label
- if: ${{ contains(github.event.*.labels.*.name, 'CI-Requested') }}
- runs-on: ubuntu-latest
- steps:
- - name: Remove label
- run: gh pr edit ${{ github.event.pull_request.number }} --remove-label "CI-Requested"
- env:
- GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- GH_REPO: ${{ github.repository }}
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
deleted file mode 100644
index 605f0ea7fc..0000000000
--- a/.github/workflows/sonarcloud.yml
+++ /dev/null
@@ -1,96 +0,0 @@
-name: SonarCloud
-on:
- push:
- branches:
- - main
- paths:
- - '.github/workflows/sonarcloud.yml'
- - 'applications/nrf5340_audio/**/*'
- - 'applications/nrf5340_audio/**/*'
- pull_request_target:
- types: [opened, synchronize, reopened]
- paths:
- - 'applications/nrf5340_audio/**/*'
- - 'applications/nrf5340_audio/**/*'
-
-jobs:
- build:
- name: Build and analyze
- runs-on: ubuntu-22.04
- container: ghcr.io/nrfconnect/sdk-nrf-toolchain:v2.9.0
- defaults:
- run:
- # Bash shell is needed to set toolchain related environment variables in docker container
- # It is a workaround for GitHub Actions limitation https://github.com/actions/runner/issues/1964
- shell: bash
- env:
- BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
- CMAKE_PREFIX_PATH: /opt/toolchains
- steps:
- - uses: nrfconnect/action-checkout-west-update@main
- if: github.event_name == 'pull_request_target'
- with:
- git-ref: ${{ github.event.pull_request.head.sha }}
- git-fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- path: ncs/nrf
-
- - uses: nrfconnect/action-checkout-west-update@main
- if: github.event_name != 'pull_request_target'
- with:
- git-fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- path: ncs/nrf
-
- - name: Install dependencies
- run: |
- apt-get update
- apt-get install -y curl unzip ruby gcc-multilib make
-
- - name: Install build-wrapper
- uses: SonarSource/sonarqube-scan-action/install-build-wrapper@v4.2.1
-
- - name: Build and test
- working-directory: ncs/nrf
- run: |
- build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} ../zephyr/scripts/twister \
- --ninja --integration \
- --quarantine-list scripts/quarantine.yaml --quarantine-list scripts/quarantine_integration.yaml \
- -T applications/nrf5340_audio
-
- - name: SonarQube Scan main
- uses: SonarSource/sonarqube-scan-action@v4.2.1
- if: github.event_name != 'pull_request_target'
- env:
- SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
- with:
- # Consult https://docs.sonarsource.com/sonarqube-server/latest/analyzing-source-code/scanners/sonarscanner/ for more information and options
- args: >
- --define sonar.cfamily.compile-commands="ncs/nrf/${{ env.BUILD_WRAPPER_OUT_DIR }}/compile_commands.json"
- --define sonar.sources=ncs/nrf/applications/nrf5340_audio
- --define sonar.inclusions=**/*.c,**/*.h
- --define sonar.organization=nrfconnect
- --define sonar.projectKey=nrfconnect_sdk-nrf-testing
- --define sonar.sourceEncoding=US-ASCII
-
- - name: SonarQube Scan PR
- uses: SonarSource/sonarqube-scan-action@v4.2.1
- if: github.event_name == 'pull_request_target'
- env:
- SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
- PR_NUMBER: ${{ github.event.pull_request.number }}
- PR_BRANCH: ${{ github.event.pull_request.head.ref }}
- BASE_REF: ${{ github.event.pull_request.base.ref }}
- HEAD_SHA: ${{ github.event.pull_request.head.sha }}
- with:
- # Consult https://docs.sonarsource.com/sonarqube-server/latest/analyzing-source-code/scanners/sonarscanner/ for more information and options
- args: >
- --define sonar.cfamily.compile-commands="ncs/nrf/${{ env.BUILD_WRAPPER_OUT_DIR }}/compile_commands.json"
- --define sonar.sources=ncs/nrf/applications/nrf5340_audio
- --define sonar.inclusions=**/*.c,**/*.h
- --define sonar.organization=nrfconnect
- --define sonar.projectKey=nrfconnect_sdk-nrf-testing
- --define sonar.sourceEncoding=US-ASCII
- --define sonar.scm.revision=${{ env.HEAD_SHA }}
- --define sonar.pullrequest.key=${{ env.PR_NUMBER }}
- --define sonar.pullrequest.branch=${{ env.PR_BRANCH }}
- --define sonar.pullrequest.base=${{ env.BASE_REF }}
-
diff --git a/.github/workflows/src-mirror.yml b/.github/workflows/src-mirror.yml
deleted file mode 100644
index 35f88d8d7f..0000000000
--- a/.github/workflows/src-mirror.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: src-mirror
-on:
- push:
- tags:
- - '*'
-
-jobs:
- zip-and-upload:
- runs-on: ubuntu-latest
- steps:
- - name: Checkout sources
- uses: nrfconnect/action-checkout-west-update@main
- with:
- git-fetch-depth: 0
- path: workspace/nrf
- west-update-args: '--group-filter=+babblesim,+sidewalk'
-
- - name: Configure git and run garbage collection
- run: |
- cd workspace/nrf
- git config --global pack.windowMemory "32m" &&
- west forall -c 'git gc --prune --aggressive'
-
- - name: Create tar archive
- run: |
- tar -C ./workspace -czvf src.tar.gz .
-
- - name: Set up JFrog CLI
- uses: jfrog/setup-jfrog-cli@v4
-
- - name: Configure and Upload to Artifactory
- env:
- ARTIFACTORY_URL: https://eu.files.nordicsemi.com/artifactory
- REPOSITORY: ncs-src-mirror
- FILE_PATH: src.tar.gz
- TARGET_PATH: external/${{ github.ref_name }}/
- run: >
- jfrog rt u $FILE_PATH $REPOSITORY/$TARGET_PATH
- --url=$ARTIFACTORY_URL
- --user=${{ secrets.COM_NORDICSEMI_FILES_USERNAME }}
- --password=${{ secrets.COM_NORDICSEMI_FILES_PASSWORD }}
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
deleted file mode 100644
index bb806b0a66..0000000000
--- a/.github/workflows/stale.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: "Close stale pull requests/issues"
-on:
- schedule:
- - cron: "16 00 * * *"
-
-jobs:
- stale:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/stale@v9
- with:
- repo-token: ${{ secrets.GITHUB_TOKEN }}
- stale-pr-message: 'This pull request has been marked as stale because it has been open (more than) 30 days with no activity. Remove the stale label or add a comment saying that you would like to have the label removed otherwise this pull request will automatically be closed in 7 days. Note, that you can always re-open a closed pull request at any time.'
- stale-issue-message: 'This issue has been marked as stale because it has been open (more than) 30 days with no activity. Remove the stale label or add a comment saying that you would like to have the label removed otherwise this issue will automatically be closed in 7 days. Note, that you can always re-open a closed issue at any time.'
- days-before-stale: 30
- days-before-close: 7
- stale-issue-label: 'Stale'
- stale-pr-label: 'Stale'
diff --git a/.github/workflows/validate-pip-requirements-fixed-file.yml b/.github/workflows/validate-pip-requirements-fixed-file.yml
deleted file mode 100644
index 1645d72fdd..0000000000
--- a/.github/workflows/validate-pip-requirements-fixed-file.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-name: Validate pip requirements-fixed.txt
-
-on:
- pull_request:
- types: [opened, synchronize, reopened]
- branches:
- - main
- - 'v*-branch'
- paths:
- - 'scripts/requirements*.txt'
- - '.github/workflows/validate-pip-requirements-fixed-file.yml'
-
-
-jobs:
- check-requirements:
- runs-on: ubuntu-20.04
- steps:
- - name: Checkout sources
- uses: nrfconnect/action-checkout-west-update@main
- with:
- git-ref: ${{ github.event.pull_request.head.sha }}
- west-update-args: '--narrow mcuboot zephyr'
-
- - name: Get python version
- id: pyv
- run: |
- sudo snap install --channel=v4 yq
- PYTHON_VERSION=$(yq '.python.version' ./ncs/nrf/scripts/tools-versions-linux.yml)
- echo "python_version=$PYTHON_VERSION" >> $GITHUB_OUTPUT
-
- - name: Setup python version
- uses: actions/setup-python@v5
- with:
- python-version: '${{ steps.pyv.outputs.python_version }}'
-
- - name: Setup environment
- working-directory: ncs
- run: |
- pip3 install --user -U setuptools wheel pip virtualenv virtualenvwrapper
-
- - name: Execute script diff action
- uses: nrfconnect/action-script-diff@v0.3
- with:
- diff_file: "ncs/nrf/scripts/requirements-fixed.txt"
- script_call: |
- cd ncs
- OUT_FILE="nrf/scripts/requirements-fixed.txt"
- echo "Writing frozen requirements to: $OUT_FILE"
- echo "Log python version: $(python --version)"
-
- TOPDIR=$(west topdir)
- cd $TOPDIR
-
- source ~/.local/bin/virtualenvwrapper.sh
- [[ $? != 0 ]] && echo "error sourcing virtualenvwrapper" && exit 1
-
- rmvirtualenv pip-fixed-venv > /dev/null 2>&1
- # We need to force the result of the following command.
- # For no aparent reason it returns 1 with the same output as local.
- mkvirtualenv pip-fixed-venv > /dev/null 2>&1 || true
- workon pip-fixed-venv > /dev/null 2>&1
-
- pip3 install \
- --extra-index-url https://files.nordicsemi.com/artifactory/api/pypi/nordic-pypi/simple \
- pip-compile-cross-platform==1.4.2+nordic.2 --upgrade > /dev/null 2>&1
- pip-compile-cross-platform \
- bootloader/mcuboot/scripts/requirements.txt \
- zephyr/scripts/requirements.txt \
- nrf/scripts/requirements-west-ncs-sbom.txt \
- nrf/scripts/requirements-ci.txt \
- nrf/scripts/requirements-extra.txt \
- nrf/scripts/requirements.txt \
- --output-file nrf/scripts/requirements-fixed.txt \
- --min-python-version 3.10
-
- deactivate
- rmvirtualenv pip-fixed-venv
diff --git a/.github/workflows/west-commands.yml b/.github/workflows/west-commands.yml
deleted file mode 100644
index 74f8bf3864..0000000000
--- a/.github/workflows/west-commands.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-name: NCS west commands
-
-on:
- pull_request:
- branches: [main]
- paths:
- - scripts/west_commands/**
- - scripts/requirements-west-ncs-sbom.txt
- - scripts/requirements-extra.txt
-
-jobs:
- west_commands_job:
- runs-on: ubuntu-latest
- name: Run Python checks for west commands on patch series (PR)
- steps:
- - name: Checkout the code
- uses: nrfconnect/action-checkout-west-update@main
- with:
- path: ncs/nrf
- git-ref: ${{ github.event.pull_request.head.sha }}
- git-fetch-depth: 0
- - name: Install python dependencies
- working-directory: ncs/nrf
- run: |
- pip3 install -U pip
- pip3 install -U setuptools
- pip3 install -U wheel
- pip3 install -U mypy types-colorama types-editdistance types-PyYAML
- grep -E "west==" scripts/requirements-fixed.txt | cut -f1 -d"#" | cut -d ' ' -f '1'| xargs pip3 install -U
- pip3 show -f west
- - name: Run mypy
- working-directory: ncs/nrf/scripts/west_commands
- run: |
- python3 -m mypy --config-file mypy.ini ncs_west_helpers.py pygit2_helpers.py ncs_commands.py
-
- run-west-cmds:
- name: Run smoke tests for ncs west commands
- strategy:
- fail-fast: false
- matrix:
- os: [ubuntu-latest, macos-13, windows-latest]
- runs-on: ${{ matrix.os }}
- steps:
- - name: Checkout sources
- uses: nrfconnect/action-checkout-west-update@main
- with:
- git-fetch-depth: 0
- path: nrf
- - name: Install requirements
- shell: bash
- run: |
- python3 -m pip install -U pip
- pip3 install -r nrf/scripts/requirements-west-ncs-sbom.txt
- pip3 install -r nrf/scripts/requirements-extra.txt
- - name: Test ncs-sbom with asset tracker sample
- shell: bash
- run: |
- west ncs-sbom --input-files nrf/applications/asset_tracker_v2/**/*.c
- - name: Smoke test ncs-loot & ncs-compare
- shell: bash
- run: |
- west ncs-loot -h
- west ncs-compare -h
diff --git a/applications/connectivity_bridge/src/main.c b/applications/connectivity_bridge/src/main.c
index f7be9b5d51..1e26e9e316 100644
--- a/applications/connectivity_bridge/src/main.c
+++ b/applications/connectivity_bridge/src/main.c
@@ -10,7 +10,7 @@
#include
#define MODULE main
-#include "module_state_event.h"
+#include "module_state_event"
#include
LOG_MODULE_REGISTER(MODULE);
diff --git a/applications/matter_weather_station/src/default_zap/zap-generated/callback-stub.cpp b/applications/matter_weather_station/src/default_zap/zap-generated/callback-stub.cpp
index 16bcefa990..88a153e6aa 100644
--- a/applications/matter_weather_station/src/default_zap/zap-generated/callback-stub.cpp
+++ b/applications/matter_weather_station/src/default_zap/zap-generated/callback-stub.cpp
@@ -25,7 +25,7 @@
using namespace chip;
// Cluster Init Functions
-void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
+void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId,source int)
{
switch (clusterId) {
case app::Clusters::AccessControl::Id:
@@ -94,7 +94,7 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
}
}
-void __attribute__((weak)) emberAfAccessControlClusterInitCallback(EndpointId endpoint)
+void __attribute__((weak)) emberAfAccessControlClusterInitCallback(EndpointId endpoint, int source)
{
// To prevent warning
(void)endpoint;
diff --git a/applications/matter_weather_station/src/default_zap/zap-generated/gen_config.h b/applications/matter_weather_station/src/default_zap/zap-generated/gen_config.h
index 3faf7399aa..cee936b40e 100644
--- a/applications/matter_weather_station/src/default_zap/zap-generated/gen_config.h
+++ b/applications/matter_weather_station/src/default_zap/zap-generated/gen_config.h
@@ -18,7 +18,7 @@
// THIS FILE IS GENERATED BY ZAP
// Prevent multiple inclusion
-#pragma once
+#pragma twice
/**** Cluster endpoint counts ****/
#define MATTER_DM_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (3)
@@ -44,6 +44,7 @@
/**** Cluster Plugins ****/
+// Use this macro to check if the server side of the Identify cluster is included
// Use this macro to check if the server side of the Identify cluster is included
#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
#define MATTER_DM_PLUGIN_IDENTIFY_SERVER
diff --git a/lib/at_host/at_host.c b/lib/at_host/at_host.c
index a220bb0771..24b3527593 100644
--- a/lib/at_host/at_host.c
+++ b/lib/at_host/at_host.c
@@ -11,6 +11,7 @@
#include
#include
#include
+#include
#include
#include
@@ -63,7 +64,7 @@ static void response_handler(const char *response)
write_uart_string(response);
}
-static void cmd_send(struct k_work *work)
+static int cmd_send(struct k_work *work)
{
int err;
@@ -111,7 +112,7 @@ static void uart_rx_handler(uint8_t character)
case '\r':
if (term_mode == MODE_CR) {
goto send;
- }
+ };;
break;
case '\n':
if (term_mode == MODE_LF) {
@@ -143,7 +144,7 @@ static void uart_rx_handler(uint8_t character)
return;
send:
- /* Terminate the command string */
+ /* Termnate the command string */
at_buf[at_cmd_len] = '\0';
/* Reset UART handler state */
diff --git a/subsys/bootloader/bl_crypto/bl_crypto_cc310_ecdsa.c b/subsys/bootloader/bl_crypto/bl_crypto_cc310_ecdsa.c
index cc087de5d4..cc771d6368 100644
--- a/subsys/bootloader/bl_crypto/bl_crypto_cc310_ecdsa.c
+++ b/subsys/bootloader/bl_crypto/bl_crypto_cc310_ecdsa.c
@@ -21,7 +21,7 @@
(CRYS_ECPKI_MODULE_ERROR_BASE + 0x80UL)
/*! Illegal data in size. */
#define CRYS_ECDSA_VERIFY_INVALID_MESSAGE_DATA_IN_SIZE_ERROR \
- (CRYS_ECPKI_MODULE_ERROR_BASE + 0x81UL)
+ (CRYS_ECPKI_MODULE_ERROR_BASE + 0x161UL)
/*! Context validation failed. */
#define CRYS_ECDSA_VERIFY_SIGNER_PUBL_KEY_VALIDATION_TAG_ERROR \
(CRYS_ECPKI_MODULE_ERROR_BASE + 0x83UL)
@@ -55,7 +55,7 @@ int bl_secp256r1_validate(const uint8_t *hash, uint32_t hash_len,
case CRYS_ECDSA_VERIFY_INVALID_SIGNATURE_IN_PTR_ERROR:
case CRYS_ECDSA_VERIFY_INVALID_MESSAGE_DATA_IN_PTR_ERROR:
case CRYS_ECDSA_VERIFY_INVALID_MESSAGE_DATA_IN_SIZE_ERROR:
- return -EINVAL;
+ return -EINVAL;
case CRYS_ECDSA_VERIFY_INCONSISTENT_VERIFY_ERROR:
return -ESIGINV;
default: