Merge remote-tracking branch 'upstream/main' into ci/rmllvm
This commit is contained in:
10
.github/actions/setup-deps/action.yml
vendored
10
.github/actions/setup-deps/action.yml
vendored
@@ -18,14 +18,14 @@ runs:
|
||||
shell: bash
|
||||
run: |
|
||||
brew update
|
||||
|
||||
|
||||
# Install LLVM if requested
|
||||
if [[ "${{ inputs.install-llvm }}" == "true" ]]; then
|
||||
brew install llvm@${{inputs.llvm-version}} lld@${{inputs.llvm-version}}
|
||||
brew link --overwrite llvm@${{inputs.llvm-version}} lld@${{inputs.llvm-version}}
|
||||
echo "$(brew --prefix llvm@${{inputs.llvm-version}})/bin" >> $GITHUB_PATH
|
||||
fi
|
||||
|
||||
|
||||
# Install common dependencies
|
||||
brew install bdw-gc openssl libffi libuv
|
||||
brew link --overwrite libffi
|
||||
@@ -38,9 +38,10 @@ runs:
|
||||
sqlite # for github.com/goplus/lib/c/sqlite
|
||||
)
|
||||
brew install "${opt_deps[@]}"
|
||||
|
||||
|
||||
brew install python@3.12 || true # for github.com/goplus/lib/py
|
||||
brew link --overwrite python@3.12
|
||||
|
||||
- name: Install Ubuntu dependencies
|
||||
if: runner.os == 'Linux'
|
||||
shell: bash
|
||||
@@ -55,7 +56,7 @@ runs:
|
||||
else
|
||||
sudo apt-get update
|
||||
fi
|
||||
|
||||
|
||||
# Install common dependencies
|
||||
sudo apt-get install -y pkg-config libgc-dev libssl-dev zlib1g-dev libffi-dev libcjson-dev libuv1-dev
|
||||
|
||||
@@ -68,3 +69,4 @@ runs:
|
||||
python3.12-dev # for github.com/goplus/lib/py
|
||||
)
|
||||
sudo apt-get install -y "${opt_deps[@]}"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user