mirror of
https://github.com/bytecodealliance/wasm-micro-runtime.git
synced 2025-05-07 12:16:24 +00:00
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
This commit is contained in:
parent
913c2227ba
commit
3e20194ecd
4
.github/workflows/compilation_on_nuttx.yml
vendored
4
.github/workflows/compilation_on_nuttx.yml
vendored
|
@ -88,14 +88,14 @@ jobs:
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
repository: apache/nuttx
|
repository: apache/nuttx
|
||||||
ref: releases/12.6
|
ref: releases/12.9
|
||||||
path: nuttx
|
path: nuttx
|
||||||
|
|
||||||
- name: Checkout NuttX Apps
|
- name: Checkout NuttX Apps
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
repository: apache/nuttx-apps
|
repository: apache/nuttx-apps
|
||||||
ref: releases/12.6
|
ref: releases/12.9
|
||||||
path: apps
|
path: apps
|
||||||
|
|
||||||
- name: Checkout WAMR
|
- name: Checkout WAMR
|
||||||
|
|
26
.github/workflows/spec_test_on_nuttx.yml
vendored
26
.github/workflows/spec_test_on_nuttx.yml
vendored
|
@ -146,14 +146,14 @@ jobs:
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
repository: apache/nuttx
|
repository: apache/nuttx
|
||||||
ref: ${{ matrix.target_config.target == 'xtensa' && '985d395b025cf2012b22f6bb4461959fa6d87645' || 'releases/12.6' }}
|
ref: ${{ matrix.target_config.target == 'xtensa' && '985d395b025cf2012b22f6bb4461959fa6d87645' || 'releases/12.9' }}
|
||||||
path: nuttx
|
path: nuttx
|
||||||
|
|
||||||
- name: Checkout NuttX Apps
|
- name: Checkout NuttX Apps
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
repository: apache/nuttx-apps
|
repository: apache/nuttx-apps
|
||||||
ref: ${{ matrix.target_config.target == 'xtensa' && '2ef3eb25c0cec944b13792185f7e5d5a05990d5f' || 'releases/12.6' }}
|
ref: ${{ matrix.target_config.target == 'xtensa' && '2ef3eb25c0cec944b13792185f7e5d5a05990d5f' || 'releases/12.9' }}
|
||||||
path: apps
|
path: apps
|
||||||
|
|
||||||
- name: Checkout WAMR
|
- name: Checkout WAMR
|
||||||
|
@ -183,28 +183,6 @@ jobs:
|
||||||
if: contains(matrix.wamr_test_option.mode, 'aot')
|
if: contains(matrix.wamr_test_option.mode, 'aot')
|
||||||
run: cp -r core/deps/llvm apps/interpreters/wamr/wamr/core/deps/llvm
|
run: cp -r core/deps/llvm apps/interpreters/wamr/wamr/core/deps/llvm
|
||||||
|
|
||||||
# Inject the config option to NuttX
|
|
||||||
# TODO: Merge this into NuttX once GC is generally available
|
|
||||||
#
|
|
||||||
# Note: the version of nuttx-apps we use for xtensa does have
|
|
||||||
# an equivalent. (the default of INTERPRETERS_WAMR_TAIL_CALL is
|
|
||||||
# different though.)
|
|
||||||
- name: Modify Kconfig
|
|
||||||
if: matrix.target_config.target != 'xtensa'
|
|
||||||
run: |
|
|
||||||
echo "\n" >> apps/interpreters/wamr/Kconfig
|
|
||||||
echo "config INTERPRETERS_WAMR_GC" >> apps/interpreters/wamr/Kconfig
|
|
||||||
echo "\tbool \"Enable GC\"" >> apps/interpreters/wamr/Kconfig
|
|
||||||
echo "\tdefault n" >> apps/interpreters/wamr/Kconfig
|
|
||||||
echo "\n" >> apps/interpreters/wamr/Kconfig
|
|
||||||
echo "config INTERPRETERS_WAMR_AOT_STACK_FRAME" >> apps/interpreters/wamr/Kconfig
|
|
||||||
echo "\tbool \"Enable AOT stack frame\"" >> apps/interpreters/wamr/Kconfig
|
|
||||||
echo "\tdefault n" >> apps/interpreters/wamr/Kconfig
|
|
||||||
echo "\n" >> apps/interpreters/wamr/Kconfig
|
|
||||||
echo "config INTERPRETERS_WAMR_TAIL_CALL" >> apps/interpreters/wamr/Kconfig
|
|
||||||
echo "\tbool \"Enable Tail Call\"" >> apps/interpreters/wamr/Kconfig
|
|
||||||
echo "\tdefault y" >> apps/interpreters/wamr/Kconfig
|
|
||||||
|
|
||||||
- name: Build wamrc
|
- name: Build wamrc
|
||||||
if: contains(matrix.wamr_test_option.mode, 'aot')
|
if: contains(matrix.wamr_test_option.mode, 'aot')
|
||||||
working-directory: apps/interpreters/wamr/wamr/wamr-compiler
|
working-directory: apps/interpreters/wamr/wamr/wamr-compiler
|
||||||
|
|
Loading…
Reference in New Issue
Block a user