update CI to Ubuntu 24.04 (#9139)
This commit is contained in:
Pentarctagon
GitHub
parent
d8f2df16aa
commit
5c3188581b
12 changed files with 13 additions and 133 deletions
6
.github/workflows/ci-main.yml
vendored
6
.github/workflows/ci-main.yml
vendored
|
|
@ -11,7 +11,7 @@ jobs:
|
|||
checks: # checks that don't need a wesnoth binary
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: wesnoth/wesnoth:2204-master
|
||||
image: wesnoth/wesnoth:2404-master
|
||||
options: --tty # docker create options
|
||||
env:
|
||||
CLICOLOR_FORCE: 1
|
||||
|
|
@ -58,7 +58,7 @@ jobs:
|
|||
- { tool: cmake, cc: clang, cxx: clang++, cfg: release, lto: true, sys_lua: true }
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: wesnoth/wesnoth:2204-master
|
||||
image: wesnoth/wesnoth:2404-master
|
||||
options: --tty # docker create options
|
||||
env:
|
||||
TOOL: ${{ matrix.tool }}
|
||||
|
|
@ -217,7 +217,7 @@ jobs:
|
|||
translations:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: wesnoth/wesnoth:2204-master
|
||||
image: wesnoth/wesnoth:2404-master
|
||||
env:
|
||||
LANGUAGE: en_US.UTF-8
|
||||
LANG: en_US.UTF-8
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ end
|
|||
|
||||
-- WORLD_CONQUEST_TEK_ENEMY_SUPPLY
|
||||
function enemy.do_supply(cfg, group_id, loc)
|
||||
if not (cfg.supply == 1) then
|
||||
if cfg.supply ~= 1 then
|
||||
return
|
||||
end
|
||||
local u = wesnoth.units.get(loc[1], loc[2])
|
||||
|
|
|
|||
|
|
@ -446,7 +446,7 @@ function wesnoth.wml_actions.message(cfg)
|
|||
end
|
||||
|
||||
-- Unhilight the speaker
|
||||
if speaker and not cfg.highlight == false then
|
||||
if speaker and cfg.highlight == true then
|
||||
wesnoth.interface.deselect_hex()
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ function pickadvance.show_dialog_unsynchronized(advance_info, unit)
|
|||
img = empty_icon_unit
|
||||
end
|
||||
this_row.the_icon.label = img
|
||||
this_row.global_icon.visible = not not (advance_type.id == game_override_one) or "hidden"
|
||||
this_row.global_icon.visible = advance_type.id == game_override_one or "hidden"
|
||||
end
|
||||
|
||||
window.the_list:focus()
|
||||
|
|
|
|||
|
|
@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES = NO
|
|||
|
||||
OUTPUT_LANGUAGE = English
|
||||
|
||||
# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
|
||||
# documentation generated by doxygen is written. Doxygen will use this
|
||||
# information to generate all generated output in the proper direction.
|
||||
# Possible values are: None, LTR, RTL and Context.
|
||||
# The default value is: None.
|
||||
|
||||
OUTPUT_TEXT_DIRECTION = None
|
||||
|
||||
# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
|
||||
# descriptions after the members that are listed in the file and class
|
||||
# documentation (similar to Javadoc). Set to NO to disable this.
|
||||
|
|
@ -1248,15 +1240,6 @@ HTML_COLORSTYLE_SAT = 100
|
|||
|
||||
HTML_COLORSTYLE_GAMMA = 80
|
||||
|
||||
# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
|
||||
# page will contain the date and time when the page was generated. Setting this
|
||||
# to YES can help to show when doxygen was last run and thus if the
|
||||
# documentation is up to date.
|
||||
# The default value is: NO.
|
||||
# This tag requires that the tag GENERATE_HTML is set to YES.
|
||||
|
||||
HTML_TIMESTAMP = NO
|
||||
|
||||
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
|
||||
# documentation will contain a main index with vertical navigation menus that
|
||||
# are dynamically created via JavaScript. If disabled, the navigation index will
|
||||
|
|
@ -1538,17 +1521,6 @@ EXT_LINKS_IN_WINDOW = NO
|
|||
|
||||
FORMULA_FONTSIZE = 10
|
||||
|
||||
# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
|
||||
# generated for formulas are transparent PNGs. Transparent PNGs are not
|
||||
# supported properly for IE 6.0, but are supported on all modern browsers.
|
||||
#
|
||||
# Note that when changing this option you need to delete any form_*.png files in
|
||||
# the HTML output directory before the changes have effect.
|
||||
# The default value is: YES.
|
||||
# This tag requires that the tag GENERATE_HTML is set to YES.
|
||||
|
||||
FORMULA_TRANSPARENT = YES
|
||||
|
||||
# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
|
||||
# to create new LaTeX commands to be used in formulas as building blocks. See
|
||||
# the section "Including formulas" for details.
|
||||
|
|
@ -1847,16 +1819,6 @@ LATEX_BATCHMODE = NO
|
|||
|
||||
LATEX_HIDE_INDICES = NO
|
||||
|
||||
# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
|
||||
# code with syntax highlighting in the LaTeX output.
|
||||
#
|
||||
# Note that which sources are shown also depends on other settings such as
|
||||
# SOURCE_BROWSER.
|
||||
# The default value is: NO.
|
||||
# This tag requires that the tag GENERATE_LATEX is set to YES.
|
||||
|
||||
LATEX_SOURCE_CODE = NO
|
||||
|
||||
# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
|
||||
# bibliography, e.g. plainnat, or ieeetr. See
|
||||
# https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
|
||||
|
|
@ -1865,14 +1827,6 @@ LATEX_SOURCE_CODE = NO
|
|||
|
||||
LATEX_BIB_STYLE = plain
|
||||
|
||||
# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
|
||||
# page will contain the date and time when the page was generated. Setting this
|
||||
# to NO can help when comparing the output of multiple runs.
|
||||
# The default value is: NO.
|
||||
# This tag requires that the tag GENERATE_LATEX is set to YES.
|
||||
|
||||
LATEX_TIMESTAMP = NO
|
||||
|
||||
# The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
|
||||
# path from which the emoji images will be read. If a relative path is entered,
|
||||
# it will be relative to the LATEX_OUTPUT directory. If left blank the
|
||||
|
|
@ -1937,16 +1891,6 @@ RTF_STYLESHEET_FILE =
|
|||
|
||||
RTF_EXTENSIONS_FILE =
|
||||
|
||||
# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
|
||||
# with syntax highlighting in the RTF output.
|
||||
#
|
||||
# Note that which sources are shown also depends on other settings such as
|
||||
# SOURCE_BROWSER.
|
||||
# The default value is: NO.
|
||||
# This tag requires that the tag GENERATE_RTF is set to YES.
|
||||
|
||||
RTF_SOURCE_CODE = NO
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
# Configuration options related to the man page output
|
||||
#---------------------------------------------------------------------------
|
||||
|
|
@ -2043,15 +1987,6 @@ GENERATE_DOCBOOK = NO
|
|||
|
||||
DOCBOOK_OUTPUT = docbook
|
||||
|
||||
# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
|
||||
# program listings (including syntax highlighting and cross-referencing
|
||||
# information) to the DOCBOOK output. Note that enabling this will significantly
|
||||
# increase the size of the DOCBOOK output.
|
||||
# The default value is: NO.
|
||||
# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
|
||||
|
||||
DOCBOOK_PROGRAMLISTING = NO
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
# Configuration options for the AutoGen Definitions output
|
||||
#---------------------------------------------------------------------------
|
||||
|
|
@ -2230,15 +2165,6 @@ EXTERNAL_PAGES = YES
|
|||
# Configuration options related to the dot tool
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
|
||||
# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
|
||||
# NO turns the diagrams off. Note that this option also works with HAVE_DOT
|
||||
# disabled, but it is recommended to install and use dot, since it yields more
|
||||
# powerful graphs.
|
||||
# The default value is: YES.
|
||||
|
||||
CLASS_DIAGRAMS = YES
|
||||
|
||||
# You can include diagrams made with dia in doxygen documentation. Doxygen will
|
||||
# then run dia to produce the diagram and insert it in the documentation. The
|
||||
# DIA_PATH tag allows you to specify the directory where the dia binary resides.
|
||||
|
|
@ -2271,23 +2197,6 @@ HAVE_DOT = YES
|
|||
|
||||
DOT_NUM_THREADS = 0
|
||||
|
||||
# When you want a differently looking font in the dot files that doxygen
|
||||
# generates you can specify the font name using DOT_FONTNAME. You need to make
|
||||
# sure dot is able to find the font, which can be done by putting it in a
|
||||
# standard location or by setting the DOTFONTPATH environment variable or by
|
||||
# setting DOT_FONTPATH to the directory containing the font.
|
||||
# The default value is: Helvetica.
|
||||
# This tag requires that the tag HAVE_DOT is set to YES.
|
||||
|
||||
DOT_FONTNAME =
|
||||
|
||||
# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
|
||||
# dot graphs.
|
||||
# Minimum value: 4, maximum value: 24, default value: 10.
|
||||
# This tag requires that the tag HAVE_DOT is set to YES.
|
||||
|
||||
DOT_FONTSIZE = 10
|
||||
|
||||
# By default doxygen will tell dot to use the default font as specified with
|
||||
# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
|
||||
# the path where dot can find it using this tag.
|
||||
|
|
@ -2502,18 +2411,6 @@ DOT_GRAPH_MAX_NODES = 300
|
|||
|
||||
MAX_DOT_GRAPH_DEPTH = 2
|
||||
|
||||
# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
|
||||
# background. This is disabled by default, because dot on Windows does not seem
|
||||
# to support this out of the box.
|
||||
#
|
||||
# Warning: Depending on the platform used, enabling this option may lead to
|
||||
# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
|
||||
# read).
|
||||
# The default value is: NO.
|
||||
# This tag requires that the tag HAVE_DOT is set to YES.
|
||||
|
||||
DOT_TRANSPARENT = YES
|
||||
|
||||
# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
|
||||
# files in one run (i.e. multiple -o and -T options on the command line). This
|
||||
# makes dot run faster, but since only newer versions of dot (>1.8.10) support
|
||||
|
|
|
|||
|
|
@ -219,7 +219,6 @@ void undo_list::clear()
|
|||
* Updates fog/shroud based on the undo stack, then updates stack as needed.
|
||||
* Call this when "updating shroud now".
|
||||
* This may fire events and change the game state.
|
||||
* @param[in] is_replay Set to true when this is called during a replay.
|
||||
*/
|
||||
bool undo_list::commit_vision()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -44,12 +44,6 @@ public:
|
|||
/**
|
||||
* Executes the dialog.
|
||||
* See @ref modal_dialog for more information.
|
||||
*
|
||||
* @param [in, out] text The parameter's usage is:
|
||||
* - Input: The initial value of the unit name.
|
||||
* - Output: The new unit name the user entered
|
||||
* if this method returns @a true, undefined
|
||||
* otherwise.
|
||||
*/
|
||||
DEFINE_SIMPLE_EXECUTE_WRAPPER(edit_text)
|
||||
|
||||
|
|
|
|||
|
|
@ -417,8 +417,6 @@ private:
|
|||
|
||||
/**
|
||||
* Initializes all fields in the dialog and set the keyboard focus.
|
||||
*
|
||||
* @param window The window which has been shown.
|
||||
*/
|
||||
virtual void init_fields();
|
||||
// TODO: Nothing else uses this. Why is it virtual?
|
||||
|
|
|
|||
|
|
@ -30,11 +30,6 @@ public:
|
|||
/**
|
||||
* Displays a simple fading screen with any user-provided text.
|
||||
* Used after the end of single-player campaigns.
|
||||
*
|
||||
* @param text Text to display, centered on the screen.
|
||||
*
|
||||
* @param duration In milliseconds, for how much time the text will
|
||||
* be displayed on screen.
|
||||
*/
|
||||
DEFINE_SIMPLE_DISPLAY_WRAPPER(outro)
|
||||
|
||||
|
|
|
|||
|
|
@ -113,9 +113,6 @@ void unit_sheath_weapon( const map_location& loc, unit_ptr u=unit_ptr(), const_a
|
|||
*
|
||||
* The 'damage' will be subtracted from the unit's hitpoints,
|
||||
* and a die effect will be displayed if the unit dies.
|
||||
*
|
||||
* @retval true if the defending unit is dead, should be
|
||||
* removed from the playing field.
|
||||
*/
|
||||
void unit_attack(display * disp, game_board & board, //TODO: Would be nice if this could be purely a display function and defer damage dealing to its caller
|
||||
const map_location& a, const map_location& b, int damage,
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
FROM ubuntu:22.04
|
||||
FROM ubuntu:24.04
|
||||
|
||||
RUN apt update
|
||||
|
||||
RUN apt install -y -qq apt-utils
|
||||
|
||||
# boost
|
||||
RUN apt install -y -qq libboost-filesystem1.74-dev libboost-filesystem1.74.0 libboost-iostreams1.74-dev libboost-iostreams1.74.0 libboost-locale1.74-dev libboost-locale1.74.0 libboost-regex1.74-dev libboost-regex1.74.0 libboost-serialization1.74-dev libboost-serialization1.74.0 libasio-dev libboost-program-options1.74-dev libboost-program-options1.74.0 libboost-random1.74-dev libboost-random1.74.0 libboost-system1.74-dev libboost-system1.74.0 libboost-thread1.74-dev libboost-thread1.74.0 libboost-test-dev libboost-context1.74.0 libboost-context1.74-dev libboost-coroutine1.74.0 libboost-coroutine1.74-dev libboost-graph1.74-dev
|
||||
RUN apt install -y -qq libboost-filesystem1.83-dev libboost-filesystem1.83.0 libboost-iostreams1.83-dev libboost-iostreams1.83.0 libboost-locale1.83-dev libboost-locale1.83.0 libboost-regex1.83-dev libboost-regex1.83.0 libboost-serialization1.83-dev libboost-serialization1.83.0 libasio-dev libboost-program-options1.83-dev libboost-program-options1.83.0 libboost-random1.83-dev libboost-random1.83.0 libboost-system1.83-dev libboost-system1.83.0 libboost-thread1.83-dev libboost-thread1.83.0 libboost-test-dev libboost-context1.83.0 libboost-context1.83-dev libboost-coroutine1.83.0 libboost-coroutine1.83-dev libboost-graph1.83-dev
|
||||
|
||||
# SDL
|
||||
RUN apt install -y -qq libsdl2-2.0-0 libsdl2-dev libsdl2-image-2.0-0 libsdl2-image-dev libsdl2-mixer-2.0-0 libsdl2-mixer-dev
|
||||
|
|
@ -26,7 +26,7 @@ RUN apt install -y -qq openssl gdb xvfb bzip2 git scons cmake make ccache gcc g+
|
|||
WORKDIR /home/wesnoth-travis
|
||||
|
||||
# build another copy of boost with _GLIBCXX_DEBUG enabled, since program options requires this
|
||||
COPY boost_1_74_0.tar.gz .
|
||||
RUN tar -xvzf boost_1_74_0.tar.gz && cd boost_1_74_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
|
||||
RUN rm -R /home/wesnoth-travis/boost_1_74_0
|
||||
RUN rm /home/wesnoth-travis/boost_1_74_0.tar.gz
|
||||
COPY boost_1_83_0.tar.gz .
|
||||
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
|
||||
RUN rm -R /home/wesnoth-travis/boost_1_83_0
|
||||
RUN rm /home/wesnoth-travis/boost_1_83_0.tar.gz
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
FROM wesnoth/wesnoth:2204-master
|
||||
FROM wesnoth/wesnoth:2404-master
|
||||
|
||||
RUN apt update
|
||||
# install flatpak
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue