Skip to content

Commit fa2f29f

Browse files
authored
Fix issues in releasing wamr-lldb (#2497)
- Update lldb patch due to swig was upgraded to 4.1 in macos - Export LD_LIBRARY_PATH for searching libpython3.10.so when validating wamr-lldb in Ubuntu-20.04 - Rename lldb-wasm.patch to lldb_wasm.path
1 parent 858d1dd commit fa2f29f

File tree

4 files changed

+103
-64
lines changed

4 files changed

+103
-64
lines changed

.github/workflows/build_wamr_lldb.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@ on:
2828
required: false
2929
default: "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-20/wasi-sdk-20.0-linux.tar.gz"
3030

31-
3231
jobs:
3332
try_reuse:
3433
uses: ./.github/workflows/reuse_latest_release_binaries.yml
3534
with:
3635
binary_name_stem: "wamr-lldb-${{ inputs.ver_num }}-${{ inputs.arch }}-${{ inputs.runner }}"
3736
last_commit: "ea63ba4bd010c2285623ad4acc0262a4d63bcfea"
38-
the_path: "./build-scripts/lldb-wasm.patch"
37+
the_path: "./build-scripts/lldb_wasm.patch"
3938
upload_url: ${{ inputs.upload_url }}
4039

4140
build:
@@ -107,7 +106,7 @@ jobs:
107106
git init
108107
git config user.email "[email protected]"
109108
git config user.name "github action"
110-
git apply ../../../build-scripts/lldb-wasm.patch
109+
git apply ../../../build-scripts/lldb_wasm.patch
111110
working-directory: core/deps/llvm-project
112111

113112
- name: get stand-alone python ubuntu
@@ -163,6 +162,7 @@ jobs:
163162
mkdir -p wamr-debug
164163
cmake -S product-mini/platforms/linux -B wamr-debug -DWAMR_BUILD_DEBUG_INTERP=1
165164
cmake --build wamr-debug --parallel $(nproc)
165+
export LD_LIBRARY_PATH=$(pwd)/core/deps/python/lib:${LD_LIBRARY_PATH}
166166
python3 ci/validate_lldb.py --port 1239 --lldb core/deps/wamr-lldb/bin/lldb --wamr wamr-debug/iwasm --verbose
167167
working-directory: .
168168

.github/workflows/compilation_on_android_ubuntu.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ jobs:
594594
cache-name: cache-lldb-vscode
595595
with:
596596
path: test-tools/wamr-ide/VSCode-Extension/resource/debug/linux
597-
key: ${{ env.cache-name }}-${{ hashFiles('build-scripts/lldb-wasm.patch') }}-${{ env.PYTHON_UBUNTU_STANDALONE_BUILD }}
597+
key: ${{ env.cache-name }}-${{ hashFiles('build-scripts/lldb_wasm.patch') }}-${{ env.PYTHON_UBUNTU_STANDALONE_BUILD }}
598598

599599
- if: ${{ steps.cache-lldb.outputs.cache-hit != 'true' }}
600600
name: get stand-alone python ubuntu
@@ -617,7 +617,7 @@ jobs:
617617
git init
618618
git config user.email "[email protected]"
619619
git config user.name "github action"
620-
git apply ../../../build-scripts/lldb-wasm.patch
620+
git apply ../../../build-scripts/lldb_wasm.patch
621621
working-directory: core/deps/llvm-project
622622

623623
- if: ${{ steps.cache-lldb.outputs.cache-hit != 'true' }}

0 commit comments

Comments
 (0)