diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9319191..b1ad7cf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,7 +21,7 @@ jobs: include: - target: x86_64-unknown-linux-gnu arch: x86_64 - os: ubuntu-20.04 + os: ubuntu-22.04 ninja_file: ninja-linux.zip ninja_sha: b901ba96e486dce377f9a070ed4ef3f79deb45f4ffe2938f8e7ddc69cfb3df77 ninja_dir: /usr/local/bin @@ -56,6 +56,10 @@ jobs: brew update && brew install coreutils && brew install swig if: matrix.os == 'macos-latest' shell: bash + - name: Install Linux tools for LLDB + run: | + sudo apt-get install build-essential swig python3-dev libedit-dev libncurses5-dev libxml2-dev + if: matrix.os == 'ubuntu-22.04' - name: Install Ninja run: | curl -L -O "https://github.com/ninja-build/ninja/releases/download/v1.11.1/${{ matrix.ninja_file }}" && \ diff --git a/build.sh b/build.sh index 897a67c..59ac153 100755 --- a/build.sh +++ b/build.sh @@ -117,7 +117,11 @@ if [[ "${HOST_TRIPLE}" != "x86_64-pc-windows-msvc" ]] ; then cp -R newlib_install/sbf-solana/include deploy/llvm/ cp -R rust/src/llvm-project/lldb/scripts/solana/* deploy/llvm/bin/ cp -R rust/build/${HOST_TRIPLE}/llvm/lib/liblldb.* deploy/llvm/lib/ - cp -R rust/build/${HOST_TRIPLE}/llvm/lib/python* deploy/llvm/lib/ + if [[ "${HOST_TRIPLE}" == "x86_64-unknown-linux-gnu" || "${HOST_TRIPLE}" == "aarch64-unknown-linux-gnu" ]]; then + cp -r rust/build/${HOST_TRIPLE}/llvm/local/lib/python* deploy/llvm/lib + else + cp -R rust/build/${HOST_TRIPLE}/llvm/lib/python* deploy/llvm/lib/ + fi fi # Check the Rust binaries