diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 2905fa0..601b9c5 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -18,7 +18,7 @@ jobs: - name: Install Pre reqs run: | brew update - brew install automake binutils coreutils curl gettext libtool openssl pkgconfig + brew install xz automake binutils coreutils curl gettext libtool openssl pkgconfig brew upgrade - name: build run: ./mac/ci-build.sh diff --git a/mac/ci-build.sh b/mac/ci-build.sh old mode 100644 new mode 100755 index e6372c6..3bc8e7e --- a/mac/ci-build.sh +++ b/mac/ci-build.sh @@ -1,15 +1,15 @@ #!/bin/bash -export LIBCURL_LIBS="-L/usr/local/opt/curl/lib" -export LIBCURL_CFLAGS="-I/usr/local/opt/curl/include" - echo "------------------ CURL" brew --prefix curl echo "------------------ OpenSSL " brew --prefix openssl -./autogen.sh +PROJECT_NAME=$(grep AC_INIT configure.ac | cut -d[ -f2 | cut -d] -f1) +VERSION=$(grep AC_INIT configure.ac | cut -d[ -f3 | cut -d] -f1) + +./autogen.sh --prefix="/${PROJECT_NAME}/${VERSION}" if [ "$?" != "0" ]; then exit -1 fi -- libgit2 0.21.2