Skip to content

Commit

Permalink
scripts: fix yaml lint warnings
Browse files Browse the repository at this point in the history
[KRKNWK-16842]
trim trailing whitespaces
remove empty lines

Signed-off-by: Krzysztof Taborowski <[email protected]>
  • Loading branch information
ktaborowski committed May 25, 2023
1 parent 1b960e4 commit 815e331
Show file tree
Hide file tree
Showing 11 changed files with 34 additions and 35 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/common-build-samples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -22,7 +22,7 @@ jobs:
image: nordicplayground/nrfconnect-sdk:main
options: --cpus 2

steps:
steps:
- name: Checkout
uses: actions/checkout@v3
with:
Expand All @@ -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()
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand All @@ -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()
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/common-run-ut-on-dut.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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()
Expand All @@ -54,7 +54,7 @@ jobs:
twister-out/twister.xml
twister-out/**/handler.log
twister-out/**/device.log
- name: Cleanup
if: always()
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/nrf-upmerge-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@ name: NRF upmerge
on:
schedule:
- cron: "0 1 * * 0"

workflow_dispatch:

jobs:
change_nrf_revision:

name: Create PR with NRF upmerge
runs-on: ubuntu-latest
env:
env:
CI_COMMIT_AUTHOR: Continuous Integration
steps:
- name: Checkout sidewalk
uses: actions/checkout@v3
with:
path: sidewalk
ref: main

- name: Checkout nrf
uses: actions/checkout@v3
with:
Expand All @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: On Commit action
on:
push:
branches: ["main"]

workflow_dispatch:

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/post-pr-comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
6 changes: 3 additions & 3 deletions .github/workflows/publish-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Deploy static content to Pages

on:
push:
branches:
branches:
- main
paths:
- 'doc/**'
Expand Down Expand Up @@ -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
10 changes: 5 additions & 5 deletions .github/workflows/tag-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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*
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion samples/template_ble/pm_static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ sidewalk_storage:
region: flash_primary
size: 0x6000

mfg_storage:
mfg_storage:
address: 0xff000
size: 0x1000
2 changes: 1 addition & 1 deletion tests/manual/ble/sample.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 1 addition & 2 deletions tests/manual/simple_bootloader/pm_static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ sidewalk_storage:
region: flash_primary
size: 0x6000

mfg_storage:
mfg_storage:
address: 0xff000
size: 0x1000

0 comments on commit 815e331

Please sign in to comment.