From 012af09d80d3eab3bed3a35461cbe87679c35baf Mon Sep 17 00:00:00 2001 From: Brent Yarger Date: Thu, 19 Sep 2024 12:35:10 -0700 Subject: [PATCH 1/3] Fix make check and make install on MacOS Fixes #38, #39 --- Makefile.am | 2 +- tests/simple_get.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index cebaf23..7dfea36 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,7 +38,7 @@ docs: check_PROGRAMS = tests/simple_get if OSX -AM_LDFLAGS = -framework CoreFoundation +AM_LDFLAGS = -framework CoreFoundation -framework Security endif if LINUX diff --git a/tests/simple_get.c b/tests/simple_get.c index 3ce8c0a..8391f57 100644 --- a/tests/simple_get.c +++ b/tests/simple_get.c @@ -2,7 +2,7 @@ #include "coraza/coraza.h" -void logcb(void *log, const void *data) +void logcb(const void *data) { printf("%s\n", (const char *)data); } From 46e452b9d7ad9cccf396c9e4aca315aba8e8c3bb Mon Sep 17 00:00:00 2001 From: Brent Yarger Date: Tue, 24 Sep 2024 10:46:04 -0400 Subject: [PATCH 2/3] Add macos-latest to CI --- .github/workflows/make-install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/make-install.yml b/.github/workflows/make-install.yml index 122d2f6..0156f5b 100644 --- a/.github/workflows/make-install.yml +++ b/.github/workflows/make-install.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: go-version: [1.18.x, 1.19.x] - os: [ubuntu-latest] + os: [ubuntu-latest, macos-latest] runs-on: ${{ matrix.os }} steps: - name: Install Go From 5787737d677780d89da3404f910caad8cbd32539 Mon Sep 17 00:00:00 2001 From: Brent Yarger Date: Wed, 25 Sep 2024 10:55:24 -0400 Subject: [PATCH 3/3] Install autoconf automake libtool for macOS runners --- .github/workflows/make-install.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/make-install.yml b/.github/workflows/make-install.yml index 0156f5b..ce855d3 100644 --- a/.github/workflows/make-install.yml +++ b/.github/workflows/make-install.yml @@ -20,6 +20,10 @@ jobs: with: lfs: true fetch-depth: 0 #for better blame info + - name: Install macOS dependencies + if: runner.os == 'macOS' + run: | + brew install autoconf automake libtool - name: Setup run: | ./build.sh