From 815e331c73a781e1a9acc61ec030a8d1c615100b Mon Sep 17 00:00:00 2001 From: Krzysztof Taborowski Date: Thu, 25 May 2023 14:28:38 +0200 Subject: [PATCH] scripts: fix yaml lint warnings [KRKNWK-16842] trim trailing whitespaces remove empty lines Signed-off-by: Krzysztof Taborowski --- .github/workflows/common-build-samples.yml | 12 ++++++------ .github/workflows/common-run-ut-on-dut.yml | 8 ++++---- .github/workflows/nrf-upmerge-pr.yml | 8 ++++---- .github/workflows/on-commit.yml | 2 +- .github/workflows/on-pr.yml | 2 +- .github/workflows/post-pr-comment.yml | 14 +++++++------- .github/workflows/publish-documentation.yml | 6 +++--- .github/workflows/tag-action.yml | 10 +++++----- samples/template_ble/pm_static.yml | 2 +- tests/manual/ble/sample.yaml | 2 +- tests/manual/simple_bootloader/pm_static.yml | 3 +-- 11 files changed, 34 insertions(+), 35 deletions(-) diff --git a/.github/workflows/common-build-samples.yml b/.github/workflows/common-build-samples.yml index e086366fdb..6910768931 100644 --- a/.github/workflows/common-build-samples.yml +++ b/.github/workflows/common-build-samples.yml @@ -2,7 +2,7 @@ name: Build Sidewalk samples and tests on: workflow_call: inputs: - change_nrf_revision: + change_nrf_revision: description: 'change revision of nrf in west.yml to `main`' default: false required: false @@ -22,7 +22,7 @@ jobs: image: nordicplayground/nrfconnect-sdk:main options: --cpus 2 - steps: + steps: - name: Checkout uses: actions/checkout@v3 with: @@ -43,7 +43,7 @@ jobs: - name: Twister build samples ${{ matrix.platform }} run: /workdir/zephyr/scripts/twister --platform ${{ matrix.platform }} --testsuite-root /workdir/sidewalk/samples/ --inline-logs --show-footprint --footprint-from-buildlog -vvv --build-only --subset ${{ matrix.subset }}/${{ env.MAX_SUBSETS }} - + - name: Upload build artifacts uses: actions/upload-artifact@v3 if: always() @@ -97,7 +97,7 @@ jobs: - name: Build test artifacts for ${{ matrix.platform }} run: /workdir/zephyr/scripts/twister --platform ${{ matrix.platform }} --testsuite-root /workdir/sidewalk/tests/ --inline-logs -vvv --build-only --subset ${{ matrix.subset }}/${{ env.MAX_SUBSETS }} - + - name: Upload build artifacts uses: actions/upload-artifact@v3 if: always() @@ -150,7 +150,7 @@ jobs: - name: Build test artifacts for x86 and run run: /workdir/zephyr/scripts/twister --platform native_posix --platform unit_testing --testsuite-root /workdir/sidewalk/tests/ --inline-logs -vvv --subset ${{ matrix.subset }}/${{ env.MAX_SUBSETS }} - + - name: Upload build artifacts uses: actions/upload-artifact@v3 if: always() @@ -172,7 +172,7 @@ jobs: twister-out/**/zephyr/dfu_application.zip twister-out/**/testbinary twister-out/twister.json - + - name: Upload test results uses: actions/upload-artifact@v3 if: always() diff --git a/.github/workflows/common-run-ut-on-dut.yml b/.github/workflows/common-run-ut-on-dut.yml index 0b117dac7e..af65cb9e17 100644 --- a/.github/workflows/common-run-ut-on-dut.yml +++ b/.github/workflows/common-run-ut-on-dut.yml @@ -18,7 +18,7 @@ jobs: echo "/usr/share" >> $GITHUB_PATH echo "/snap/bin" >> $GITHUB_PATH rm -rf sidewalk artifacts twister-out* .west - + - uses: actions/checkout@v3 with: path: sidewalk @@ -28,7 +28,7 @@ jobs: west init -l sidewalk west update --narrow -o=--depth=1 python3 -m pip install -r zephyr/scripts/requirements.txt - + - uses: actions/download-artifact@v3 with: path: artifacts @@ -44,7 +44,7 @@ jobs: - name: Run Tests run: | zephyr/scripts/twister -vvv --inline-logs --test-only --hardware-map /hw_settings/hardware_map.yaml --device-testing -T sidewalk/tests --retry-failed 2 - + - name: Upload test results uses: actions/upload-artifact@v3 if: always() @@ -54,7 +54,7 @@ jobs: twister-out/twister.xml twister-out/**/handler.log twister-out/**/device.log - + - name: Cleanup if: always() run: | diff --git a/.github/workflows/nrf-upmerge-pr.yml b/.github/workflows/nrf-upmerge-pr.yml index 3dc2489510..fd01c558f3 100644 --- a/.github/workflows/nrf-upmerge-pr.yml +++ b/.github/workflows/nrf-upmerge-pr.yml @@ -3,7 +3,7 @@ name: NRF upmerge on: schedule: - cron: "0 1 * * 0" - + workflow_dispatch: jobs: @@ -11,7 +11,7 @@ jobs: name: Create PR with NRF upmerge runs-on: ubuntu-latest - env: + env: CI_COMMIT_AUTHOR: Continuous Integration steps: - name: Checkout sidewalk @@ -19,7 +19,7 @@ jobs: with: path: sidewalk ref: main - + - name: Checkout nrf uses: actions/checkout@v3 with: @@ -31,7 +31,7 @@ jobs: run: | python3 -m pip install -r sidewalk/scripts/ci/requirements.txt nrf_hash="$(git -C nrf rev-parse HEAD)" - python3 sidewalk/scripts/ci/replace_nrf_revision_in_west.py -r $nrf_hash sidewalk/west.yml + python3 sidewalk/scripts/ci/replace_nrf_revision_in_west.py -r $nrf_hash sidewalk/west.yml - name: Get Date id: date run: | diff --git a/.github/workflows/on-commit.yml b/.github/workflows/on-commit.yml index a106674973..0fed34943c 100644 --- a/.github/workflows/on-commit.yml +++ b/.github/workflows/on-commit.yml @@ -3,7 +3,7 @@ name: On Commit action on: push: branches: ["main"] - + workflow_dispatch: jobs: diff --git a/.github/workflows/on-pr.yml b/.github/workflows/on-pr.yml index 4d0190cfa5..ea3b0a5d38 100644 --- a/.github/workflows/on-pr.yml +++ b/.github/workflows/on-pr.yml @@ -59,7 +59,7 @@ jobs: - name: Save PR number to file run: | echo "${{ github.event.number }}" > PR_number - + - name: Upload build artifacts uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/post-pr-comment.yml b/.github/workflows/post-pr-comment.yml index 77b455d244..dd60c4381e 100644 --- a/.github/workflows/post-pr-comment.yml +++ b/.github/workflows/post-pr-comment.yml @@ -14,30 +14,30 @@ jobs: pull-requests: write contents: read checks: write - + steps: - name: Checkout uses: actions/checkout@v3 - + - name: Get artifacts from PR uses: dawidd6/action-download-artifact@v2 with: run_id: ${{github.event.workflow_run.id}} path: current - + - name: Get artifacts from PR base uses: dawidd6/action-download-artifact@v2 with: commit: ${{github.event.workflow_run.event.pull_request.base.sha}} workflow: on_commit.yml path: old - + - name: Unpack PR number id: get-pr-number run: | pr_number="$(cat current/PR_number/PR_number)" echo "pr_number=$pr_number" >> $GITHUB_OUTPUT - + - name: Generage memory diff run: | pr_reports=$(ls current/**/twister.json) @@ -52,12 +52,12 @@ jobs: with: issue-number: ${{ steps.get-pr-number.outputs.pr_number }} comment-author: 'github-actions[bot]' - body-includes: "| Sample | | diff | used | total |" + body-includes: "| Sample | | diff | used | total |" - name: Create or update comment uses: peter-evans/create-or-update-comment@v3 with: - comment-id: ${{ steps.fc.outputs.comment-id }} + comment-id: ${{ steps.fc.outputs.comment-id }} issue-number: ${{ steps.get-pr-number.outputs.pr_number }} body-path: memory_usage.md edit-mode: replace diff --git a/.github/workflows/publish-documentation.yml b/.github/workflows/publish-documentation.yml index ddf549cd33..768664126a 100644 --- a/.github/workflows/publish-documentation.yml +++ b/.github/workflows/publish-documentation.yml @@ -3,7 +3,7 @@ name: Deploy static content to Pages on: push: - branches: + branches: - main paths: - 'doc/**' @@ -36,13 +36,13 @@ jobs: uses: actions/configure-pages@v3 - name: Build - run: cd doc; ./build_local.sh + run: cd doc; ./build_local.sh - name: Upload artifact uses: actions/upload-pages-artifact@v1 with: path: 'doc/build/html' - + - name: Deploy to GitHub Pages id: deployment uses: actions/deploy-pages@v1 diff --git a/.github/workflows/tag-action.yml b/.github/workflows/tag-action.yml index 4817cfef40..4cd080b758 100644 --- a/.github/workflows/tag-action.yml +++ b/.github/workflows/tag-action.yml @@ -22,21 +22,21 @@ jobs: workflow: on_commit.yml dry_run: true if_no_artifact_found: ignore - + - name: Sleep 15 min to wait for builds if: ${{steps.get_artifacts.outputs.dry_run == false}} run: | sleep 15m - + - name: Get artifacts from commit uses: dawidd6/action-download-artifact@v2 with: commit: ${{github.sha}} workflow: on_commit.yml - + - name: Build documentation run: cd doc; ./build_local.sh && zip -r documentation.zip build/html/* - + - name: Pack build artifacts run: | zip -r build_artifacts.zip sample* @@ -50,7 +50,7 @@ jobs: asset_name: documentation.zip tag: ${{ github.ref }} overwrite: true - + - name: Upload build binaries to release uses: svenstaro/upload-release-action@v2 with: diff --git a/samples/template_ble/pm_static.yml b/samples/template_ble/pm_static.yml index 70e2006f8c..2d3e52a65d 100644 --- a/samples/template_ble/pm_static.yml +++ b/samples/template_ble/pm_static.yml @@ -11,6 +11,6 @@ sidewalk_storage: region: flash_primary size: 0x6000 -mfg_storage: +mfg_storage: address: 0xff000 size: 0x1000 diff --git a/tests/manual/ble/sample.yaml b/tests/manual/ble/sample.yaml index 23598e1222..c46da57c18 100644 --- a/tests/manual/ble/sample.yaml +++ b/tests/manual/ble/sample.yaml @@ -1,6 +1,6 @@ sample: name: Sidewalk Bluetooth LE test - description: Test Bluetooth with controller (e.g. smartphone with nRF Connect App) + description: Test Bluetooth with controller (e.g. smartphone with nRF Connect App) tests: sidewalk.test.ble: platform_allow: nrf52840dk_nrf52840 diff --git a/tests/manual/simple_bootloader/pm_static.yml b/tests/manual/simple_bootloader/pm_static.yml index f33809ffae..2038306383 100644 --- a/tests/manual/simple_bootloader/pm_static.yml +++ b/tests/manual/simple_bootloader/pm_static.yml @@ -16,7 +16,6 @@ sidewalk_storage: region: flash_primary size: 0x6000 -mfg_storage: +mfg_storage: address: 0xff000 size: 0x1000 -