diff --git a/.github/workflows/cleanup.sh b/.github/workflows/cleanup.sh deleted file mode 100644 index 9153db88..00000000 --- a/.github/workflows/cleanup.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -e - -if pkg=$(brew list | grep -E "pkg-config"); then - brew uninstall "$pkg" || true -fi diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index e5f669a5..594bb059 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -16,10 +16,10 @@ jobs: uses: actions/setup-node@v4 with: node-version: '20' - + - name: Install embedme run: npm install -g embedme - + - name: Verify README.md embedded code run: npx embedme --verify README.md @@ -32,7 +32,7 @@ jobs: runs-on: ${{matrix.os}} steps: - uses: actions/checkout@v4 - + - name: Set up Go uses: actions/setup-go@v5 with: @@ -43,7 +43,6 @@ jobs: run: | set -e set -x - bash .github/workflows/cleanup.sh source doc/_readme/scripts/install_macos.sh - name: Install dependencies on Ubuntu diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 8c6873d6..4cf46e31 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -41,9 +41,8 @@ jobs: - name: Install dependencies if: startsWith(matrix.os, 'macos') run: | - bash .github/workflows/cleanup.sh 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 "PKG_CONFIG_PATH=/opt/homebrew/opt/libffi/lib/pkgconfig" >> $GITHUB_ENV diff --git a/README.md b/README.md index 605f6a72..b3989888 100644 --- a/README.md +++ b/README.md @@ -358,7 +358,7 @@ Follow these steps to generate the `llgo` command (its usage is the same as the ```sh 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 go install -v github.com/goplus/llgo/cmd/llgo@latest ``` diff --git a/doc/_readme/scripts/install_macos.sh b/doc/_readme/scripts/install_macos.sh index 9892979d..07c83514 100644 --- a/doc/_readme/scripts/install_macos.sh +++ b/doc/_readme/scripts/install_macos.sh @@ -1,5 +1,5 @@ # shellcheck disable=all 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 go install -v github.com/goplus/llgo/cmd/llgo@latest \ No newline at end of file