Skip to content

Commit 9068296

Browse files
[nrf noup] Workaround for issue with Matter Docker image.
In the docker image there is a change in the zephyr-env.sh script that breaks the checkout. We need to stash the changes and reapply them after the NCS update. It should be fixed during the next NCS bump in the Matter upstream repository. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
1 parent 7626a1c commit 9068296

1 file changed

Lines changed: 11 additions & 0 deletions

File tree

.github/workflows/examples-nrfconnect.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,13 @@ jobs:
4343
uses: ./.github/actions/checkout-submodules-and-bootstrap
4444
with:
4545
platform: nrfconnect
46+
# Workaround, in docker image there is a change in the zephyr-env.sh script that breaks the checkout process.
47+
# We need to stash the changes and reapply them after the NCS update.
48+
# It should be fixed during the next NCS bump in the Matter upstream repository.
49+
- name: Pre-update NCS
50+
run: |
51+
cd /opt/NordicSemiconductor/nrfconnect/zephyr
52+
git stash
4653
- name: Update NCS recommended version (workflow_dispatch)
4754
if: github.event_name == 'workflow_dispatch'
4855
run: |
@@ -63,6 +70,10 @@ jobs:
6370
echo "Using NCS from $(cat config/nrfconnect/.nrfconnect-recommended-revision)"
6471
fi
6572
fi
73+
- name: Post-update NCS
74+
run: |
75+
cd /opt/NordicSemiconductor/nrfconnect/zephyr
76+
git stash pop
6677
- name: Check nRF Connect SDK revision.
6778
run: scripts/run_in_build_env.sh "python3 scripts/setup/nrfconnect/update_ncs.py --update"
6879
continue-on-error: true

0 commit comments

Comments
 (0)