From 43ad1bf70d8a66a6f3dd95fdf939dc21a5367bde Mon Sep 17 00:00:00 2001 From: Adrian Gielniewski Date: Thu, 13 Feb 2025 13:51:34 +0100 Subject: [PATCH] fix2 Signed-off-by: Adrian Gielniewski --- .github/workflows/examples-nrfconnect.yaml | 24 ++++++++++++---------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml index 41cbdfd124..8ee0d335ea 100644 --- a/.github/workflows/examples-nrfconnect.yaml +++ b/.github/workflows/examples-nrfconnect.yaml @@ -43,17 +43,19 @@ jobs: if: github.event_name == 'pull_request' run: | PR_DESCRIPTION=$(jq -r '.pull_request.body' $GITHUB_EVENT_PATH) - echo PR_DESCRIPTION: - echo $PR_DESCRIPTION - NCS_PR_ID=$(echo $PR_DESCRIPTION | grep '^[^>]' | grep 'NCS PR' | sed 's/.*nrfconnect\/sdk-nrf//' | grep -oE '[0-9]+') - echo NCS_PR_ID: - echo $NCS_PR_ID - if [ -n "$NCS_PR_ID" ]; then - echo "Using NCS from pull/$NCS_PR_ID/head" - git -C $ZEPHYR_BASE/../nrf fetch origin pull/$NCS_PR_ID/head:NCS_PR - echo NCS_PR > config/nrfconnect/.nrfconnect-recommended-revision - else - echo "Using NCS from $(cat config/nrfconnect/.nrfconnect-recommended-revision)" + if [ -z "$PR_DESCRIPTION" ]; then + echo PR_DESCRIPTION: + echo $PR_DESCRIPTION + NCS_PR_ID=$(echo $PR_DESCRIPTION | grep '^[^>]' | grep 'NCS PR' | sed 's/.*nrfconnect\/sdk-nrf//' | grep -oE '[0-9]+') + echo NCS_PR_ID: + echo $NCS_PR_ID + if [ -n "$NCS_PR_ID" ]; then + echo "Using NCS from pull/$NCS_PR_ID/head" + git -C $ZEPHYR_BASE/../nrf fetch origin pull/$NCS_PR_ID/head:NCS_PR + echo NCS_PR > config/nrfconnect/.nrfconnect-recommended-revision + else + echo "Using NCS from $(cat config/nrfconnect/.nrfconnect-recommended-revision)" + fi fi - name: Check nRF Connect SDK revision. run: scripts/run_in_build_env.sh "python3 scripts/setup/nrfconnect/update_ncs.py --update"