Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump ubuntu version #82

Merged
merged 2 commits into from
Oct 4, 2024
Merged

Bump ubuntu version #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ac254a
Bump ubuntu version
LucasSte Sep 30, 2024
242b6a6
Update workflow and build script for linux
LucasSte Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}" && \
Expand Down
6 changes: 5 additions & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading