From 2e45f7bfdb523482a2105294df622f5cdc62313c Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Mon, 10 Jul 2023 20:17:01 +0200 Subject: [PATCH] Fix build against Bahamut's master branch --- .github/workflows/test-devel.yml | 5 ++++- .github/workflows/test-stable.yml | 5 ++++- workflows.yml | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-devel.yml b/.github/workflows/test-devel.yml index 915f6c8..81af1ae 100644 --- a/.github/workflows/test-devel.yml +++ b/.github/workflows/test-devel.yml @@ -72,7 +72,10 @@ jobs: cd $GITHUB_WORKSPACE/Bahamut/ patch src/s_user.c < $GITHUB_WORKSPACE/patches/bahamut_localhost.patch patch src/s_bsd.c < $GITHUB_WORKSPACE/patches/bahamut_mainloop.patch - patch -p1 < $GITHUB_WORKSPACE/patches/bahamut_ubuntu22.patch + + # <= v2.2.2 + patch -p1 < $GITHUB_WORKSPACE/patches/bahamut_ubuntu22.patch || true + echo "#undef THROTTLE_ENABLE" >> include/config.h libtoolize --force aclocal diff --git a/.github/workflows/test-stable.yml b/.github/workflows/test-stable.yml index 9bf463b..4f39cf7 100644 --- a/.github/workflows/test-stable.yml +++ b/.github/workflows/test-stable.yml @@ -72,7 +72,10 @@ jobs: cd $GITHUB_WORKSPACE/Bahamut/ patch src/s_user.c < $GITHUB_WORKSPACE/patches/bahamut_localhost.patch patch src/s_bsd.c < $GITHUB_WORKSPACE/patches/bahamut_mainloop.patch - patch -p1 < $GITHUB_WORKSPACE/patches/bahamut_ubuntu22.patch + + # <= v2.2.2 + patch -p1 < $GITHUB_WORKSPACE/patches/bahamut_ubuntu22.patch || true + echo "#undef THROTTLE_ENABLE" >> include/config.h libtoolize --force aclocal diff --git a/workflows.yml b/workflows.yml index 38af377..114cf45 100644 --- a/workflows.yml +++ b/workflows.yml @@ -107,7 +107,10 @@ software: cd $GITHUB_WORKSPACE/Bahamut/ patch src/s_user.c < $GITHUB_WORKSPACE/patches/bahamut_localhost.patch patch src/s_bsd.c < $GITHUB_WORKSPACE/patches/bahamut_mainloop.patch - patch -p1 < $GITHUB_WORKSPACE/patches/bahamut_ubuntu22.patch + + # <= v2.2.2 + patch -p1 < $GITHUB_WORKSPACE/patches/bahamut_ubuntu22.patch || true + echo "#undef THROTTLE_ENABLE" >> include/config.h libtoolize --force aclocal