Skip to content

Commit eb6e3d3

Browse files
committed
.....
1 parent 07c3d2f commit eb6e3d3

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

.github/workflows/ci-main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
cmake "$@" -DCMAKE_BUILD_TYPE="$CFG" -DCXX_STD="$CXX_STD" \
108108
-DEXTRA_FLAGS_CONFIG="-pipe" -DENABLE_MYSQL=true -DENABLE_STRICT_COMPILATION=true \
109109
-DENABLE_NLS=false -DENABLE_LTO="$LTO" -DFORCE_COLOR_OUTPUT=true -DLTO_JOBS=2 \
110-
-DENABLE_SYSTEM_LUA="$SYS_LUA -DCLANG_TIDY=true" -DCMAKE_PREFIX_PATH=/usr/local/lib/cmake/SDL3;/usr/local/lib/cmake/SDL3_image;/usr/local/lib/cmake/SDL3_mixer -S . -B build
110+
-DENABLE_SYSTEM_LUA="$SYS_LUA -DCLANG_TIDY=true" -DCMAKE_PREFIX_PATH="/usr/local/lib/cmake/SDL3;/usr/local/lib/cmake/SDL3_image;/usr/local/lib/cmake/SDL3_mixer" -S . -B build
111111
}
112112
rm /usr/local/lib/libboost*
113113
rm -R /usr/local/include/boost

utils/dockerbuilds/CI/Dockerfile-base-2404-sdl3

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,13 @@ RUN cmake -S . -B ./build
4646
RUN cmake --build build
4747
RUN cmake --install build --prefix /usr/local
4848

49+
WORKDIR /usr/local/lib
50+
RUN chmod -R 777 .
51+
4952
WORKDIR /home/wesnoth-travis
5053

5154
# build another copy of boost with _GLIBCXX_DEBUG enabled, since program options requires this
52-
COPY boost_1_83_0.tar.gz .
55+
RUN wget --max-redirect 3 https://archives.boost.io/release/1.83.0/source/boost_1_83_0.tar.gz
5356
RUN tar -xvzf boost_1_83_0.tar.gz && cd boost_1_83_0 && ./bootstrap.sh --with-libraries=filesystem,locale,iostreams,program_options,regex,random,thread,coroutine,context,test,graph && ./b2 -j2 variant=debug install cxxflags='-fstack-protector-strong' define=_GLIBCXX_DEBUG=1 define=_FORTIFY_SOURCE=2 address-model=64
5457
RUN rm -R /home/wesnoth-travis/boost_1_83_0
5558
RUN rm /home/wesnoth-travis/boost_1_83_0.tar.gz

0 commit comments

Comments
 (0)