Skip to content

Commit

Permalink
Merge branch 'main' into dogfood
Browse files Browse the repository at this point in the history
  • Loading branch information
gminn committed Oct 21, 2024
2 parents 7788501 + 2fc583f commit 2e8bda0
Show file tree
Hide file tree
Showing 936 changed files with 17,737 additions and 6,067 deletions.
1 change: 1 addition & 0 deletions .checkpatch.conf
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,4 @@
--exclude applications/nrf5340_audio/src/utils/macros
--exclude lib/at_parser/generated
--exclude lib/bin/lwm2m_carrier/include
--exclude tests/lib/uicc_lwm2m
1 change: 1 addition & 0 deletions .github/test-spec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -592,6 +592,7 @@
- "snippets/emulated-*/**/*"
- "tests/subsys/event_manager_proxy/**/*"
- "tests/benchmarks/multicore/idle/**/*"
- "tests/drivers/gpio/egpio_basic_api/**/*"
- "tests/drivers/pwm/**/*"
- "tests/drivers/sensor/**/*"

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/src-mirror.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ jobs:
git config --global pack.windowMemory "32m" &&
west forall -c 'git gc --prune --aggressive'
- name: Create 7z archive
- name: Create tar archive
run: |
7z a -t7z src.7z ./workspace/
tar -C ./workspace -czvf src.tar.gz .
- name: Set up JFrog CLI
uses: jfrog/setup-jfrog-cli@v4
Expand All @@ -32,7 +32,7 @@ jobs:
env:
ARTIFACTORY_URL: https://eu.files.nordicsemi.com/artifactory
REPOSITORY: ncs-src-mirror
FILE_PATH: src.7z
FILE_PATH: src.tar.gz
TARGET_PATH: external/${{ github.ref_name }}/
run: >
jfrog rt u $FILE_PATH $REPOSITORY/$TARGET_PATH
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
name: Validate pip requirements-fixed.txt

on:
pull_request_target:
pull_request:
types: [opened, synchronize, reopened]
branches:
- main
- 'v*-branch'
paths:
- 'scripts/requirements*.txt'

env:
REACT_EMOTE: 'eyes'

jobs:
check-requirements:
runs-on: ubuntu-20.04
Expand All @@ -30,7 +27,7 @@ jobs:
echo "python_version=$PYTHON_VERSION" >> $GITHUB_OUTPUT
- name: Setup python version
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '${{ steps.pyv.outputs.python_version }}'

Expand All @@ -40,31 +37,11 @@ jobs:
pip3 install --user -U setuptools wheel pip virtualenv virtualenvwrapper
- name: Execute script diff action
uses: nrfconnect/action-script-diff@v0.2
uses: nrfconnect/action-script-diff@v0.3
with:
github-token: ${{ secrets.NCS_GITHUB_TOKEN }}
message_diff: |
This pr introduces changes to requirements files.
The compiled requirements-fixed.txt has changed.
To automatically add the changed file to this pr react with the :$REACT_EMOTE: emote to this comment and re-run the check.
[Check Run]($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID)
<details>
<summary>requirements-fixed.txt diff</summary>
\`\`\` diff
$GITDIFF
\`\`\`
</details>
message_success: |
The changes to the 'requirements-fixed.txt' have been added to this PR.
All further changes to any of the requirements file will automatically be applied as long an :$REACT_EMOTE: is present.
git_diff_root: ncs/nrf
diff_path: scripts
diff_file: requirements-fixed.txt
reaction_emote: "${{ env.REACT_EMOTE }}"
git_user_name: "Nordic Builder"
git_user_email: "pylon@nordicsemi.no"
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)"
Expand Down
46 changes: 34 additions & 12 deletions .github/workflows/west-commands.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,21 @@ on:
pull_request:
branches: [main]
paths:
- scripts/west_commands/mypy.ini
- scripts/west_commands/ncs_commands.py
- scripts/west_commands/ncs_west_helpers.py
- scripts/west_commands/pygit2_helpers.py
- 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: actions/checkout@v3
uses: nrfconnect/action-checkout-west-update@main
with:
path: ncs/nrf
ref: ${{ github.event.pull_request.head.sha }}
fetch-depth: 0
- name: cache-pip
uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ${{ runner.os }}-doc-pip
git-ref: ${{ github.event.pull_request.head.sha }}
git-fetch-depth: 0
- name: Install python dependencies
working-directory: ncs/nrf
run: |
Expand All @@ -38,3 +32,31 @@ jobs:
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: |
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
Loading

0 comments on commit 2e8bda0

Please sign in to comment.