Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 23 additions & 25 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,16 @@ name: Quality Assurance
on:
push:
pull_request:

env:
LUA_VERSION: "5.4"

jobs:
build-linux:
name: Linux (${{ matrix.platform.label }}, ${{ matrix.compiler.label }}, ${{ matrix.configure.label }})
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04]
platform:
Expand Down Expand Up @@ -40,11 +44,11 @@ jobs:
sudo apt-get install -y libyajl-dev:${{ matrix.platform.arch }} \
libcurl4-openssl-dev:${{ matrix.platform.arch }} \
liblmdb-dev:${{ matrix.platform.arch }} \
liblua5.2-dev:${{ matrix.platform.arch }} \
liblua${{ env.LUA_VERSION }}-dev:${{ matrix.platform.arch }} \
libmaxminddb-dev:${{ matrix.platform.arch }} \
libpcre2-dev:${{ matrix.platform.arch }} \
pcre2-utils:${{ matrix.platform.arch }} \
bison flex
bison flex python3 python3-venv
- name: Setup Dependencies (x32)
if: ${{ matrix.platform.label == 'x32' }}
run: |
Expand All @@ -54,11 +58,11 @@ jobs:
- name: Setup Dependencies (x64)
if: ${{ matrix.platform.label == 'x64' }}
run: |
sudo apt-get install -y libgeoip-dev:${{ matrix.platform.arch }} \
libfuzzy-dev:${{ matrix.platform.arch }}
- uses: actions/checkout@v4
sudo apt-get install -y libfuzzy-dev:${{ matrix.platform.arch }}

- uses: actions/checkout@v6
with:
submodules: true
submodules: recursive
fetch-depth: 0
- name: build.sh
run: ./build.sh
Expand All @@ -77,6 +81,7 @@ jobs:
name: macOS (${{ matrix.configure.label }})
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [macos-14]
configure:
Expand All @@ -99,27 +104,18 @@ jobs:
libtool \
yajl \
lmdb \
lua \
lua@${{ env.LUA_VERSION }} \
libmaxminddb \
libxml2 \
ssdeep \
pcre \
bison \
flex
- uses: actions/checkout@v4
flex \
python3
- uses: actions/checkout@v6
with:
submodules: true
submodules: recursive
fetch-depth: 0
- 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
autoreconf --install
./configure --disable-dependency-tracking --disable-silent-rules --prefix=/opt/homebrew
make install
- name: build.sh
run: ./build.sh
- name: configure
Expand All @@ -134,6 +130,7 @@ jobs:
name: Windows (${{ matrix.platform.label }}, ${{ matrix.configure.label }})
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [windows-2022]
platform:
Expand All @@ -147,9 +144,9 @@ jobs:
- {label: "wo libxml", opt: "-DWITH_LIBXML2=OFF" }
- {label: "with lmdb", opt: "-DWITH_LMDB=ON" }
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
submodules: true
submodules: recursive
fetch-depth: 0
- name: Install Conan
run: |
Expand Down Expand Up @@ -194,10 +191,11 @@ jobs:
brew install autoconf \
automake \
libtool \
cppcheck
- uses: actions/checkout@v4
cppcheck \
python3
- uses: actions/checkout@v6
with:
submodules: true
submodules: recursive
fetch-depth: 0
- name: configure
run: |
Expand Down
22 changes: 15 additions & 7 deletions .github/workflows/ci_new.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ on:
push:
pull_request:

env:
LUA_VERSION: "5.5"

jobs:
build-linux:
name: Linux (${{ matrix.platform.label }}, ${{ matrix.compiler.label }}, ${{ matrix.configure.label }})
Expand Down Expand Up @@ -47,7 +50,7 @@ jobs:
libyajl-dev \
libcurl4-openssl-dev \
liblmdb-dev \
liblua5.2-dev \
liblua5.4-dev \
libmaxminddb-dev \
libpcre2-dev \
libxml2-dev \
Expand All @@ -56,7 +59,9 @@ jobs:
libpcre3-dev \
bison \
flex \
pkg-config
pkg-config \
python3 \
python3-venv


- name: Run build preparation script
Expand Down Expand Up @@ -109,13 +114,14 @@ jobs:
libtool \
yajl \
lmdb \
lua \
lua@${{ env.LUA_VERSION }} \
libmaxminddb \
libxml2 \
ssdeep \
pcre \
bison \
flex
flex \
python3

- name: Run build preparation script
run: ./build.sh
Expand Down Expand Up @@ -206,7 +212,7 @@ jobs:

- name: Install cppcheck
run: |
brew install autoconf automake libtool cppcheck libmaxminddb yajl lua lmdb ssdeep
brew install autoconf automake libtool cppcheck libmaxminddb yajl lua@${{ env.LUA_VERSION }} lmdb ssdeep python3

- name: Configure project
run: |
Expand Down Expand Up @@ -249,14 +255,16 @@ jobs:
libyajl-dev \
libcurl4-openssl-dev \
liblmdb-dev \
liblua5.2-dev \
liblua${{ env.LUA_VERSION }}-dev \
libmaxminddb-dev \
libpcre2-dev \
libxml2-dev \
libfuzzy-dev \
pcre2-utils \
bison \
flex
flex \
python3 \
python3-venv

- name: Run build preparation script
run: ./build.sh
Expand Down
Loading