From 57523a632d2bfe50ec5ba8b79c6defb5bc7857d9 Mon Sep 17 00:00:00 2001 From: Phil Rzewski Date: Fri, 29 Dec 2023 10:44:37 -0800 Subject: [PATCH] Revert "Point to fixed libmaxminddb repo" This reverts commit 763389bd627d533404fc2e61163d067ecb0038c2. --- .github/workflows/release.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 92855e6..b9be64d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -49,22 +49,18 @@ jobs: if: startsWith(matrix.platform, 'windows-') run: go build -o zeekrunner.exe zeekrunner.go - - name: Checkout libmaxminddb (Windows) - if: startsWith(matrix.platform, 'windows-') - uses: actions/checkout@v3 - with: - repository: brimdata/libmaxminddb - ref: windows-sa_family_t - - name: Build libmaxminddb (Windows) if: startsWith(matrix.platform, 'windows-') run: | call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64 - mkdir libmaxminddb\build - cd libmaxminddb\build + curl -L https://github.com/maxmind/libmaxminddb/releases/download/1.8.0/libmaxminddb-1.8.0.tar.gz | tar xzvf - + mkdir libmaxminddb-1.8.0\build + cd libmaxminddb-1.8.0\build cmake .. cmake --build . cmake --build . --target install + rename "C:\Program Files (x86)\maxminddb\include\maxminddb.h" maxminddb.h.bak + sed "/typedef ADDRESS_FAMILY sa_family_t/d" "C:\Program Files (x86)\maxminddb\include\maxminddb.h.bak" > "C:\Program Files (x86)\maxminddb\include\maxminddb.h" shell: cmd - name: Build Zeek (Windows)