Skip to content

Commit 3e20194

Browse files
authored
Update NuttX and NuttX Apps references to releases/12.9 in workflow f… (#4148)
* Update NuttX and NuttX Apps references to releases/12.9 in workflow files * Remove Kconfig modification step for NuttX in spec test workflow
1 parent 913c222 commit 3e20194

File tree

2 files changed

+4
-26
lines changed

2 files changed

+4
-26
lines changed

.github/workflows/compilation_on_nuttx.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,14 @@ jobs:
8888
uses: actions/checkout@v4
8989
with:
9090
repository: apache/nuttx
91-
ref: releases/12.6
91+
ref: releases/12.9
9292
path: nuttx
9393

9494
- name: Checkout NuttX Apps
9595
uses: actions/checkout@v4
9696
with:
9797
repository: apache/nuttx-apps
98-
ref: releases/12.6
98+
ref: releases/12.9
9999
path: apps
100100

101101
- name: Checkout WAMR

.github/workflows/spec_test_on_nuttx.yml

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -146,14 +146,14 @@ jobs:
146146
uses: actions/checkout@v4
147147
with:
148148
repository: apache/nuttx
149-
ref: ${{ matrix.target_config.target == 'xtensa' && '985d395b025cf2012b22f6bb4461959fa6d87645' || 'releases/12.6' }}
149+
ref: ${{ matrix.target_config.target == 'xtensa' && '985d395b025cf2012b22f6bb4461959fa6d87645' || 'releases/12.9' }}
150150
path: nuttx
151151

152152
- name: Checkout NuttX Apps
153153
uses: actions/checkout@v4
154154
with:
155155
repository: apache/nuttx-apps
156-
ref: ${{ matrix.target_config.target == 'xtensa' && '2ef3eb25c0cec944b13792185f7e5d5a05990d5f' || 'releases/12.6' }}
156+
ref: ${{ matrix.target_config.target == 'xtensa' && '2ef3eb25c0cec944b13792185f7e5d5a05990d5f' || 'releases/12.9' }}
157157
path: apps
158158

159159
- name: Checkout WAMR
@@ -183,28 +183,6 @@ jobs:
183183
if: contains(matrix.wamr_test_option.mode, 'aot')
184184
run: cp -r core/deps/llvm apps/interpreters/wamr/wamr/core/deps/llvm
185185

186-
# Inject the config option to NuttX
187-
# TODO: Merge this into NuttX once GC is generally available
188-
#
189-
# Note: the version of nuttx-apps we use for xtensa does have
190-
# an equivalent. (the default of INTERPRETERS_WAMR_TAIL_CALL is
191-
# different though.)
192-
- name: Modify Kconfig
193-
if: matrix.target_config.target != 'xtensa'
194-
run: |
195-
echo "\n" >> apps/interpreters/wamr/Kconfig
196-
echo "config INTERPRETERS_WAMR_GC" >> apps/interpreters/wamr/Kconfig
197-
echo "\tbool \"Enable GC\"" >> apps/interpreters/wamr/Kconfig
198-
echo "\tdefault n" >> apps/interpreters/wamr/Kconfig
199-
echo "\n" >> apps/interpreters/wamr/Kconfig
200-
echo "config INTERPRETERS_WAMR_AOT_STACK_FRAME" >> apps/interpreters/wamr/Kconfig
201-
echo "\tbool \"Enable AOT stack frame\"" >> apps/interpreters/wamr/Kconfig
202-
echo "\tdefault n" >> apps/interpreters/wamr/Kconfig
203-
echo "\n" >> apps/interpreters/wamr/Kconfig
204-
echo "config INTERPRETERS_WAMR_TAIL_CALL" >> apps/interpreters/wamr/Kconfig
205-
echo "\tbool \"Enable Tail Call\"" >> apps/interpreters/wamr/Kconfig
206-
echo "\tdefault y" >> apps/interpreters/wamr/Kconfig
207-
208186
- name: Build wamrc
209187
if: contains(matrix.wamr_test_option.mode, 'aot')
210188
working-directory: apps/interpreters/wamr/wamr/wamr-compiler

0 commit comments

Comments
 (0)