From 900e7bcd0671548f3315bb414eaadae79becdceb Mon Sep 17 00:00:00 2001 From: Ervin Hegedus Date: Sat, 4 Jan 2025 13:48:39 +0100 Subject: [PATCH 1/5] Fix OSX build without GeoIP brew package --- .github/workflows/ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2fe0010a..58fedf07 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -102,7 +102,6 @@ jobs: lua \ libmaxminddb \ libxml2 \ - geoip \ ssdeep \ pcre \ bison \ @@ -111,6 +110,13 @@ jobs: with: submodules: true fetch-depth: 0 + - name: Build GeoIP + run: | + git clone https://github.com/maxmind/geoip-api-c.git + cd geoip-api-c + autoreconf --install + ./configure --disable-dependency-tracking --disable-silent-rules --prefix=/opt/homebrew + make install - name: build.sh run: ./build.sh - name: configure From d76f3e741e36ecd27275a5ce038356b19f019c33 Mon Sep 17 00:00:00 2001 From: Ervin Hegedus Date: Sat, 4 Jan 2025 20:46:36 +0100 Subject: [PATCH 2/5] Update .github/workflows/ci.yml Co-authored-by: Max Leske <250711+theseion@users.noreply.github.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 58fedf07..e6e9e42c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,7 +112,7 @@ jobs: fetch-depth: 0 - name: Build GeoIP run: | - git clone https://github.com/maxmind/geoip-api-c.git + git clone --depth 0 https://github.com/maxmind/geoip-api-c.git cd geoip-api-c autoreconf --install ./configure --disable-dependency-tracking --disable-silent-rules --prefix=/opt/homebrew From 849131c8cfdf923b12f518776215242aeca40229 Mon Sep 17 00:00:00 2001 From: Ervin Hegedus Date: Sat, 4 Jan 2025 23:46:09 +0100 Subject: [PATCH 3/5] Change depth value to 1 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e6e9e42c..ddc0d8ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,7 +112,7 @@ jobs: fetch-depth: 0 - name: Build GeoIP run: | - git clone --depth 0 https://github.com/maxmind/geoip-api-c.git + git clone --depth 1 https://github.com/maxmind/geoip-api-c.git cd geoip-api-c autoreconf --install ./configure --disable-dependency-tracking --disable-silent-rules --prefix=/opt/homebrew From 72bb873460788ae3b638ca14ad71d6e14adc5483 Mon Sep 17 00:00:00 2001 From: Ervin Hegedus Date: Sun, 5 Jan 2025 16:09:03 +0100 Subject: [PATCH 4/5] Use latest released version by commit id. Co-authored-by: Max Leske <250711+theseion@users.noreply.github.com> --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ddc0d8ec..4c741a43 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,7 +112,10 @@ jobs: fetch-depth: 0 - name: Build GeoIP run: | - git clone --depth 1 https://github.com/maxmind/geoip-api-c.git + git clone --depth 1 --no-checkout https://github.com/maxmind/geoip-api-c.git + git fetch --tags + # Check out the last release, v1.6.12 + git checkout 4b526e7331ca1d692b74a0509ddcc725622ed31a cd geoip-api-c autoreconf --install ./configure --disable-dependency-tracking --disable-silent-rules --prefix=/opt/homebrew From a332567b85e9aedce34209e30445aeea8e1957ad Mon Sep 17 00:00:00 2001 From: Ervin Hegedus Date: Sun, 5 Jan 2025 16:41:05 +0100 Subject: [PATCH 5/5] Set correct order of commands --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4c741a43..60b6db91 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -113,10 +113,10 @@ jobs: - name: Build GeoIP run: | git clone --depth 1 --no-checkout https://github.com/maxmind/geoip-api-c.git + cd geoip-api-c git fetch --tags # Check out the last release, v1.6.12 git checkout 4b526e7331ca1d692b74a0509ddcc725622ed31a - cd geoip-api-c autoreconf --install ./configure --disable-dependency-tracking --disable-silent-rules --prefix=/opt/homebrew make install