Skip to content

Commit 20e50c3

Browse files
github: disable tf-m oss-history check
Pull request #7933 is bringing in a lot of commits from upstream tf-m that are not present in the revision of tf-m in zephyr/west.yml, and the script is getting confused. In particular, it thinks that all of the new upstream commits are actually downstream out-of-tree commits. Then it tries to reapply them onto the old downstream. This fails, and the action fails. I'm not sure how to handle this case, so let's just disable the check for tf-m for now. Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
1 parent 4527961 commit 20e50c3

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

.github/workflows/oss-history.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@ jobs:
2121
run: |
2222
west init -l ncs/nrf
2323
cd ncs
24-
west update zephyr mcuboot trusted-firmware-m
24+
west update zephyr mcuboot
2525
git -C zephyr remote add upstream https://github.com/zephyrproject-rtos/zephyr
2626
2727
- name: Check OSS history
2828
uses: nrfconnect/action-oss-history@main
2929
with:
3030
workspace: 'ncs'
31+
args: -p zephyr -p mcuboot

0 commit comments

Comments
 (0)