ci: don't install pkg-config explicitly

This commit is contained in:
Li Jie
2024-11-26 09:31:22 +08:00
parent 06cc43b11f
commit 9105f28c13
5 changed files with 6 additions and 14 deletions

View File

@@ -1,6 +0,0 @@
#!/bin/bash
set -e
if pkg=$(brew list | grep -E "pkg-config"); then
brew uninstall "$pkg" || true
fi

View File

@@ -43,7 +43,6 @@ jobs:
run: | run: |
set -e set -e
set -x set -x
bash .github/workflows/cleanup.sh
source doc/_readme/scripts/install_macos.sh source doc/_readme/scripts/install_macos.sh
- name: Install dependencies on Ubuntu - name: Install dependencies on Ubuntu

View File

@@ -41,9 +41,8 @@ jobs:
- name: Install dependencies - name: Install dependencies
if: startsWith(matrix.os, 'macos') if: startsWith(matrix.os, 'macos')
run: | run: |
bash .github/workflows/cleanup.sh
brew update brew update
brew install llvm@${{matrix.llvm}} pkg-config bdw-gc openssl libffi brew install llvm@${{matrix.llvm}} bdw-gc openssl libffi
echo "$(brew --prefix llvm@${{matrix.llvm}})/bin" >> $GITHUB_PATH echo "$(brew --prefix llvm@${{matrix.llvm}})/bin" >> $GITHUB_PATH
echo "PKG_CONFIG_PATH=/opt/homebrew/opt/libffi/lib/pkgconfig" >> $GITHUB_ENV echo "PKG_CONFIG_PATH=/opt/homebrew/opt/libffi/lib/pkgconfig" >> $GITHUB_ENV

View File

@@ -358,7 +358,7 @@ Follow these steps to generate the `llgo` command (its usage is the same as the
```sh ```sh
brew update brew update
brew install llvm@18 pkg-config bdw-gc openssl cjson brew install llvm@18 bdw-gc openssl cjson
brew install python@3.12 # optional brew install python@3.12 # optional
go install -v github.com/goplus/llgo/cmd/llgo@latest go install -v github.com/goplus/llgo/cmd/llgo@latest
``` ```

View File

@@ -1,5 +1,5 @@
# shellcheck disable=all # shellcheck disable=all
brew update brew update
brew install llvm@18 pkg-config bdw-gc openssl cjson brew install llvm@18 bdw-gc openssl cjson
brew install python@3.12 # optional brew install python@3.12 # optional
go install -v github.com/goplus/llgo/cmd/llgo@latest go install -v github.com/goplus/llgo/cmd/llgo@latest