From 73ffa10f50eeb5e1b6559c94bd9b8cd8c0a11702 Mon Sep 17 00:00:00 2001 From: Johannes Weidacher Date: Thu, 23 Dec 2021 20:59:48 +0100 Subject: [PATCH 01/10] Fix build error on alpine --- src/Cedar/BridgeUnix.c | 1 + src/Mayaqua/Network.h | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Cedar/BridgeUnix.c b/src/Cedar/BridgeUnix.c index 87287d7c..bff004a4 100644 --- a/src/Cedar/BridgeUnix.c +++ b/src/Cedar/BridgeUnix.c @@ -25,6 +25,7 @@ #include #include +#include #include #include #include diff --git a/src/Mayaqua/Network.h b/src/Mayaqua/Network.h index 3475744b..fbb699b7 100644 --- a/src/Mayaqua/Network.h +++ b/src/Mayaqua/Network.h @@ -13,6 +13,7 @@ #ifdef OS_UNIX #include +#include #ifdef UNIX_OPENBSD #include From fc15d1ebd510b354494fc41a7d361492bab0669d Mon Sep 17 00:00:00 2001 From: Johannes Weidacher Date: Thu, 23 Dec 2021 21:06:19 +0100 Subject: [PATCH 02/10] fix alpine compile issue. --- src/Cedar/BridgeUnix.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Cedar/BridgeUnix.c b/src/Cedar/BridgeUnix.c index bff004a4..bc40967a 100644 --- a/src/Cedar/BridgeUnix.c +++ b/src/Cedar/BridgeUnix.c @@ -50,7 +50,6 @@ #endif #ifdef UNIX_LINUX -#include struct my_tpacket_auxdata { From 18598b5d96a6bcc92b4782ed98a2a2ab206762f2 Mon Sep 17 00:00:00 2001 From: Johannes Weidacher Date: Sat, 25 Dec 2021 15:36:52 +0100 Subject: [PATCH 03/10] Change ifdef for UNIX_LINUX Only --- src/Cedar/BridgeUnix.c | 1 + src/Mayaqua/Network.h | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/Cedar/BridgeUnix.c b/src/Cedar/BridgeUnix.c index bc40967a..5bad0af1 100644 --- a/src/Cedar/BridgeUnix.c +++ b/src/Cedar/BridgeUnix.c @@ -50,6 +50,7 @@ #endif #ifdef UNIX_LINUX +#include struct my_tpacket_auxdata { diff --git a/src/Mayaqua/Network.h b/src/Mayaqua/Network.h index fbb699b7..c630b981 100644 --- a/src/Mayaqua/Network.h +++ b/src/Mayaqua/Network.h @@ -13,12 +13,15 @@ #ifdef OS_UNIX #include + +#ifdef UNIX_LINUX #include #ifdef UNIX_OPENBSD #include #endif #endif +#endif // Dynamic Value struct DYN_VALUE From f1b464e84dfe7f989eaa6d81cde59d3384d79a69 Mon Sep 17 00:00:00 2001 From: Johannes Weidacher Date: Sat, 25 Dec 2021 15:36:52 +0100 Subject: [PATCH 04/10] fix alpine compile issue. --- src/Cedar/BridgeUnix.c | 2 +- src/Mayaqua/Network.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Cedar/BridgeUnix.c b/src/Cedar/BridgeUnix.c index bc40967a..88244b7d 100644 --- a/src/Cedar/BridgeUnix.c +++ b/src/Cedar/BridgeUnix.c @@ -25,7 +25,6 @@ #include #include -#include #include #include #include @@ -50,6 +49,7 @@ #endif #ifdef UNIX_LINUX +#include struct my_tpacket_auxdata { diff --git a/src/Mayaqua/Network.h b/src/Mayaqua/Network.h index fbb699b7..c630b981 100644 --- a/src/Mayaqua/Network.h +++ b/src/Mayaqua/Network.h @@ -13,12 +13,15 @@ #ifdef OS_UNIX #include + +#ifdef UNIX_LINUX #include #ifdef UNIX_OPENBSD #include #endif #endif +#endif // Dynamic Value struct DYN_VALUE From 7f7d72cca984db11425bf29560ec021fe7f8224c Mon Sep 17 00:00:00 2001 From: Johannes Weidacher Date: Sat, 25 Dec 2021 22:26:43 +0100 Subject: [PATCH 05/10] Add Musl build github workflow --- .github/workflows/musl.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/musl.yml diff --git a/.github/workflows/musl.yml b/.github/workflows/musl.yml new file mode 100644 index 00000000..3de074ba --- /dev/null +++ b/.github/workflows/musl.yml @@ -0,0 +1,24 @@ +name: alpine/musl + +on: + push: + +permissions: + contents: read + +jobs: + musl: + name: gcc + runs-on: ubuntu-latest + container: + image: alpine:latest + steps: + - uses: actions/checkout@v2 + with: + submodules: true + - name: Install dependencies + run: apk add binutils --no-cache build-base readline-dev openssl-dev ncurses-dev git cmake zlib-dev libsodium-dev gnu-libiconv + - name: Configure + run: make -j$(nproc) CC=cc V=1 TARGET=linux-musl USE_LUA=1 LUA_INC=/usr/include/lua5.3 LUA_LIB=/usr/lib/lua5.3 USE_OPENSSL=1 USE_PCRE2=1 USE_PCRE2_JIT=1 USE_PROMEX=1 + - name: make + run: make -C build \ No newline at end of file From 529d2c232f9133a923c1bda72a9e66880456646a Mon Sep 17 00:00:00 2001 From: weidi Date: Sat, 25 Dec 2021 22:37:34 +0100 Subject: [PATCH 06/10] use checkout@v1 to make submodules work --- .github/workflows/musl.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/musl.yml b/.github/workflows/musl.yml index 3de074ba..2be25cc6 100644 --- a/.github/workflows/musl.yml +++ b/.github/workflows/musl.yml @@ -13,7 +13,7 @@ jobs: container: image: alpine:latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v1 with: submodules: true - name: Install dependencies From 1c3dc598923e138236a786b2198c78e939d1ca51 Mon Sep 17 00:00:00 2001 From: weidi Date: Sat, 25 Dec 2021 22:40:03 +0100 Subject: [PATCH 07/10] fiexed configure step --- .github/workflows/musl.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/musl.yml b/.github/workflows/musl.yml index 2be25cc6..91743eb8 100644 --- a/.github/workflows/musl.yml +++ b/.github/workflows/musl.yml @@ -19,6 +19,6 @@ jobs: - name: Install dependencies run: apk add binutils --no-cache build-base readline-dev openssl-dev ncurses-dev git cmake zlib-dev libsodium-dev gnu-libiconv - name: Configure - run: make -j$(nproc) CC=cc V=1 TARGET=linux-musl USE_LUA=1 LUA_INC=/usr/include/lua5.3 LUA_LIB=/usr/lib/lua5.3 USE_OPENSSL=1 USE_PCRE2=1 USE_PCRE2_JIT=1 USE_PROMEX=1 + run: ./configure - name: make run: make -C build \ No newline at end of file From 3cdad95ee1795d22bdea0eaddb2e41ece6cb221f Mon Sep 17 00:00:00 2001 From: Johannes Weidacher Date: Sat, 25 Dec 2021 22:26:43 +0100 Subject: [PATCH 08/10] Add Musl build github workflow --- .github/workflows/musl.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/musl.yml diff --git a/.github/workflows/musl.yml b/.github/workflows/musl.yml new file mode 100644 index 00000000..91743eb8 --- /dev/null +++ b/.github/workflows/musl.yml @@ -0,0 +1,24 @@ +name: alpine/musl + +on: + push: + +permissions: + contents: read + +jobs: + musl: + name: gcc + runs-on: ubuntu-latest + container: + image: alpine:latest + steps: + - uses: actions/checkout@v1 + with: + submodules: true + - name: Install dependencies + run: apk add binutils --no-cache build-base readline-dev openssl-dev ncurses-dev git cmake zlib-dev libsodium-dev gnu-libiconv + - name: Configure + run: ./configure + - name: make + run: make -C build \ No newline at end of file From 09dd8a8b07a705ed21d5d5dded6c32290262bbcc Mon Sep 17 00:00:00 2001 From: weidi Date: Sun, 26 Dec 2021 16:13:53 +0100 Subject: [PATCH 09/10] endif UNIX_LINUX before BSD --- src/Mayaqua/Network.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Mayaqua/Network.h b/src/Mayaqua/Network.h index d0700d6a..7075d4b0 100644 --- a/src/Mayaqua/Network.h +++ b/src/Mayaqua/Network.h @@ -16,12 +16,13 @@ #ifdef UNIX_LINUX #include +#endif #ifdef UNIX_OPENBSD #include #endif #endif -#endif + // Dynamic Value struct DYN_VALUE From 879bd34af4ab2934ac3cc76b7c5b0b9f2a2e4347 Mon Sep 17 00:00:00 2001 From: weidi Date: Mon, 27 Dec 2021 07:26:34 +0100 Subject: [PATCH 10/10] trigger alpine build action also on pull request --- .github/workflows/musl.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/musl.yml b/.github/workflows/musl.yml index 91743eb8..240b6a25 100644 --- a/.github/workflows/musl.yml +++ b/.github/workflows/musl.yml @@ -1,7 +1,6 @@ name: alpine/musl -on: - push: +on: [push, pull_request] permissions: contents: read