Frazer Smith
9162ac9d37
Update: bump actions/checkout from 2 to 3
2022-05-14 16:58:10 +02:00
Frazer Smith
2a2f80bb71
Update: bump actions/cache from 2 to 3
2022-05-14 16:58:10 +02:00
Frazer Smith
33dabc42bb
Update: bump actions/upload-artifact from 2 to 3
2022-05-14 16:58:10 +02:00
Owen Rudge
5a6ea11ead
Feature: [Actions] Package builds for the Windows Store automatically
2022-05-04 11:40:49 +01:00
Jonathan G Rennison
34af4844d1
Merge branch 'master' into jgrpp
2022-04-02 14:16:32 +01:00
Patric Stout
8537fa7206
Fix: [Actions] Remove Ubuntu:groovy from release pipeline ( #9845 )
...
It no longer exists upstream. Let's focus on LTS only for now.
2022-04-02 12:36:15 +02:00
Owen Rudge
1bfbcff71e
Change: [Actions] Switch back to primary source for 'gon' in macOS build job
...
This reverts commit 7a97a33598
.
2022-03-31 13:00:35 +01:00
Owen Rudge
7a97a33598
Fix: [Actions] Switch source for 'gon' in macOS build job
2022-03-28 21:56:24 +01:00
Loïc Guilloux
1a17b6c8f6
Change: [Actions] Remove VS2017 and restore VS2019 for CI ( #9835 )
2022-03-13 16:05:24 +01:00
Jonathan G Rennison
16e4b84a2f
Github: Disable installing gon in OSX release build
2022-03-12 02:40:18 +00:00
Jonathan G Rennison
e5ae88e8ea
Github: Disable import windows signing cert in release workflow
2022-02-01 22:28:22 +00:00
Jonathan G Rennison
3645bcfe62
Github: Disable auto-running of release workflow
2022-01-31 02:27:39 +00:00
Jonathan G Rennison
1c7f6b97a5
Update Github release file to fix compile and distro issues
2022-01-05 19:21:43 +00:00
Jonathan G Rennison
0691b25e17
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/saveload/afterload.cpp
2021-11-20 13:15:32 +00:00
Patric Stout
0cbe94256e
Change: [Emscripten] update to 2.0.34 and use Release over RelWithDebInfo ( #9696 )
...
It turns out that having "-g" in the compile-statement causes
Emscripten to pick -g3, which makes for very big binaries. This
is very likely not your intention when building Emscripten, as
smaller really is better.
For comparison, with RelWithDebInfo the binary is ~80MB. With
Release it is ~7.4MB.
2021-11-14 16:59:49 +01:00
Jonathan G Rennison
656c596c33
Disable fetching MacOS code signing certs in release workflow
2021-11-11 01:01:14 +00:00
Jonathan G Rennison
f79977ad0b
Disable signing installer in release workflow
2021-11-11 00:58:22 +00:00
Jonathan G Rennison
49228a5ee4
Disable unused strings check on PRs for now
...
See: #333
2021-11-09 00:46:45 +00:00
Jonathan G Rennison
e5668cb9ad
CI: Remove regression test from MSYS job
2021-11-03 02:04:12 +00:00
Jonathan G Rennison
9e946d4c5d
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/command.cpp
# src/console_cmds.cpp
# src/group_gui.cpp
# src/lang/catalan.txt
# src/lang/czech.txt
# src/lang/danish.txt
# src/lang/greek.txt
# src/lang/hungarian.txt
# src/lang/irish.txt
# src/lang/japanese.txt
# src/lang/luxembourgish.txt
# src/lang/norwegian_bokmal.txt
# src/lang/romanian.txt
# src/lang/russian.txt
# src/lang/serbian.txt
# src/lang/simplified_chinese.txt
# src/lang/slovak.txt
# src/lang/spanish_MX.txt
# src/lang/swedish.txt
# src/lang/tamil.txt
# src/lang/traditional_chinese.txt
# src/lang/turkish.txt
# src/lang/ukrainian.txt
# src/lang/vietnamese.txt
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_func.h
# src/network/network_internal.h
# src/network/network_server.cpp
# src/network/network_server.h
# src/saveload/afterload.cpp
# src/saveload/newgrf_sl.cpp
# src/saveload/saveload.h
# src/script/script_instance.cpp
# src/toolbar_gui.cpp
# src/toolbar_gui.h
# src/vehicle_gui.cpp
# src/widgets/rail_widget.h
# src/widgets/vehicle_widget.h
# src/window.cpp
2021-11-03 00:45:12 +00:00
Jonathan G Rennison
324e90e5ac
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/lang/arabic_egypt.txt
# src/lang/english.txt
# src/lang/greek.txt
# src/network/core/tcp_connect.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/pathfinder/npf/npf.cpp
# src/pathfinder/yapf/yapf_ship.cpp
# src/rail_gui.cpp
# src/settings_table.cpp
# src/settings_type.h
# src/station_cmd.cpp
# src/table/settings/gui_settings.ini
# src/town_cmd.cpp
# src/widgets/rail_widget.h
2021-11-02 19:23:24 +00:00
Jonathan G Rennison
9e1bb3eea7
Merge tag '12.0-beta2' into jgrpp-beta
...
# Conflicts:
# docs/landscape_grid.html
# src/lang/simplified_chinese.txt
# src/network/network_server.cpp
# src/station_cmd.cpp
2021-11-02 18:02:37 +00:00
Jonathan G Rennison
faf32200cf
Merge tag '12.0-beta1' into jgrpp-beta
...
# Conflicts:
# CMakeLists.txt
# bin/ai/CMakeLists.txt
# bin/game/CMakeLists.txt
# src/build_vehicle_gui.cpp
# src/console_cmds.cpp
# src/core/overflowsafe_type.hpp
# src/fios.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/lang/polish.txt
# src/network/core/game_info.cpp
# src/network/core/game_info.h
# src/network/core/tcp_game.cpp
# src/network/core/tcp_game.h
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_coordinator.cpp
# src/network/network_gui.cpp
# src/network/network_server.cpp
# src/network/network_server.h
# src/newgrf_engine.cpp
# src/openttd.cpp
# src/rev.cpp.in
# src/settings_type.h
# src/train.h
# src/train_cmd.cpp
2021-11-02 17:51:38 +00:00
Jonathan G Rennison
62afd94b47
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/company_cmd.cpp
# src/economy.cpp
# src/lang/swedish.txt
# src/network/network_command.cpp
# src/news_gui.cpp
# src/saveload/saveload.h
# src/script/api/script_list.cpp
# src/video/cocoa/cocoa_v.mm
# src/video/sdl2_v.cpp
2021-11-01 18:54:43 +00:00
Jonathan G Rennison
61cc60099a
Merge branch 'jgrpp' into jgrpp-beta
...
# Conflicts:
# src/network/core/packet.cpp
# src/network/core/udp.cpp
2021-10-29 22:22:54 +01:00
Jonathan G Rennison
23497dea35
Github: Enable blank issues, remove contact links section
2021-10-29 19:51:27 +01:00
Jonathan G Rennison
da282c3ecc
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# .github/workflows/ci-build.yml
# CMakeLists.txt
# src/lang/finnish.txt
# src/lang/french.txt
# src/lang/korean.txt
# src/lang/norwegian_bokmal.txt
# src/lang/russian.txt
# src/lang/spanish.txt
# src/misc_gui.cpp
# src/newgrf.cpp
2021-10-28 23:51:24 +01:00
glx22
14429bbe8a
Change: [Actions] Also check desync debug
2021-10-19 09:05:00 +01:00
Patric Stout
5bcdf16dc5
Fix 01603d9e
: [Preview] publishing preview failed due to recent changes ( #9621 )
...
Since 01603d9e
we run under root, not under github user. In result,
the location of "aws" binary changed.
2021-10-17 22:42:29 +02:00
Patric Stout
01603d9e47
Fix 3046a6ce
: [Preview] building preview failed to patch LZMA ( #9620 )
...
The job was started under a non-priv user, which did not have
permission to patch the emscripten files required to make LZMA
work.
2021-10-17 21:59:50 +02:00
Loïc Guilloux
46123742f5
Change: [Actions] Use macOS-11 image for releases ( #9605 )
2021-10-03 21:14:59 +02:00
Patric Stout
3046a6ce39
Change: upgrade Emscripten to 2.0.31 and enable LZMA by default ( #9604 )
2021-10-03 16:20:05 +02:00
Jonathan G Rennison
fd605e3cf3
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# .github/workflows/commit-checker.yml
# src/company_cmd.cpp
# src/console_cmds.cpp
# src/crashlog.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/indonesian.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/swedish.txt
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/mcf.cpp
# src/network/core/tcp.cpp
# src/network/core/tcp.h
# src/network/core/tcp_game.h
# src/network/core/udp.h
# src/network/network.cpp
# src/network/network_admin.cpp
# src/network/network_admin.h
# src/network/network_chat_gui.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_func.h
# src/network/network_internal.h
# src/network/network_server.cpp
# src/network/network_server.h
# src/newgrf.cpp
# src/newgrf_station.cpp
# src/order_gui.cpp
# src/rail_cmd.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_type.h
# src/station_cmd.cpp
# src/stdafx.h
# src/table/currency_settings.ini
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/table/settings.ini
# src/terraform_cmd.cpp
# src/timetable_gui.cpp
# src/train_cmd.cpp
# src/tree_cmd.cpp
# src/water_cmd.cpp
2021-09-27 22:47:23 +01:00
Jonathan G Rennison
0b0d154788
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# .github/workflows/ci-build.yml
# src/lang/german.txt
# src/lang/romanian.txt
# src/lang/slovak.txt
# src/lang/turkish.txt
# src/network/core/address.cpp
# src/network/core/tcp.h
# src/network/core/udp.cpp
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_server.cpp
# src/network/network_server.h
# src/network/network_udp.cpp
# src/openttd.cpp
# src/saveload/newgrf_sl.cpp
# src/tree_cmd.cpp
# src/video/video_driver.hpp
# src/window.cpp
# src/window_gui.h
2021-09-22 21:50:02 +01:00
Patric Stout
9c74dc2468
Codechange: validate that all STR_NNN strings are defined and used ( #9518 )
2021-09-02 22:32:10 +02:00
frosch
93fd42b0c3
Doc: guidelines on english.txt or translation changes in PRs. ( #9505 )
2021-08-22 14:27:48 +02:00
Patric Stout
b2eafcc720
Fix: [Actions] changelog assumed major.minor.patch versioning ( #9482 )
...
We now use major.minor versioning, so it failed to pick up the
correct information.
2021-08-15 14:14:13 +02:00
Patric Stout
b67ef1e5b8
Fix: [Actions] Ubuntu 18.04 by default has a compiler too old for OpenTTD ( #9481 )
2021-08-15 13:08:58 +02:00
rubidium42
98e653dacc
Fix #9386 : compilers failing to compile with LTO by using variants instead of new + unique_ptr
...
With std::variant all memory can be figured out at compile time, so the compiler needs to keep track of fewer elements. It also saves out a unique_ptr and its memory management, over a slight impact for resolving a setting.
2021-06-26 20:28:34 +02:00
Patric Stout
1ed7afc0a8
Change: [GitHub] use an issue form to let people fill in bug report / crashes ( #9400 )
2021-06-26 13:51:29 +02:00
Loïc Guilloux
f86c66cbd7
Codechange: [Actions] Improve MSYS2 setup time ( #9360 )
2021-06-13 13:26:45 +02:00
Loïc Guilloux
acb6348ba6
Add: [Actions] msys2/MinGW CI ( #8698 )
2021-06-10 23:54:52 +02:00
Owen Rudge
3ce7e31f64
Feature: Sign Windows builds
2021-05-26 13:40:44 +01:00
Patric Stout
3477405e86
Change: [Actions] use newly created Actions instead of custom shell-scripting ( #9284 )
2021-05-20 19:12:33 +02:00
Loïc Guilloux
c53d9991ee
Add: [Actions] Check CI annotations to detect compile warnings ( #9217 )
2021-05-10 14:48:04 +02:00
Loïc Guilloux
282d5d302d
Change: [Actions] Add a 2 minutes timeout for regression test ( #9166 )
2021-05-01 16:18:41 +02:00
Jonathan G Rennison
8eb27e1ac7
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/company_cmd.cpp
# src/lang/japanese.txt
# src/network/core/config.h
# src/network/core/packet.cpp
# src/network/core/tcp.cpp
# src/network/network_content.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui_base.h
2021-04-25 22:14:59 +01:00
Tyler Trahan
27031b396f
Change: [Actions] Reword bug/crash report instructions ( #9104 )
2021-04-25 19:27:30 +01:00
Jonathan G Rennison
253772e9af
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# COMPILING.md
# src/console.cpp
# src/console_cmds.cpp
# src/console_internal.h
# src/rev.cpp.in
2021-04-25 02:14:58 +01:00
Patric Stout
2e39ac5ba2
Add: [GitHub] use issue templates to make it more clear what we expect from users ( #9092 )
2021-04-24 17:03:19 +02:00
Jonathan G Rennison
d0159f2452
Github: Disable CI build workflow on push to master
2021-04-11 03:16:06 +01:00
Jonathan G Rennison
edfa04286b
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/release.yml
# bin/CMakeLists.txt
# src/dock_gui.cpp
# src/lang/brazilian_portuguese.txt
# src/lang/catalan.txt
# src/lang/czech.txt
# src/lang/dutch.txt
# src/lang/english.txt
# src/lang/english_US.txt
# src/lang/estonian.txt
# src/lang/finnish.txt
# src/lang/french.txt
# src/lang/german.txt
# src/lang/hungarian.txt
# src/lang/indonesian.txt
# src/lang/italian.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/lithuanian.txt
# src/lang/luxembourgish.txt
# src/lang/norwegian_bokmal.txt
# src/lang/polish.txt
# src/lang/portuguese.txt
# src/lang/romanian.txt
# src/lang/russian.txt
# src/lang/serbian.txt
# src/lang/simplified_chinese.txt
# src/lang/slovak.txt
# src/lang/spanish.txt
# src/lang/spanish_MX.txt
# src/lang/swedish.txt
# src/lang/tamil.txt
# src/lang/ukrainian.txt
# src/lang/vietnamese.txt
# src/newgrf.cpp
# src/newgrf_gui.cpp
# src/object_gui.cpp
# src/pathfinder/yapf/yapf_costrail.hpp
# src/pathfinder/yapf/yapf_node_rail.hpp
# src/rail_cmd.cpp
# src/roadveh_cmd.cpp
# src/town_cmd.cpp
# src/vehicle.cpp
# src/water_cmd.cpp
2021-04-11 02:39:33 +01:00
Jonathan G Rennison
5e14b54a0c
Merge branch 'master' into jgrpp
2021-04-05 17:51:45 +01:00
Charles Pigott
2a9825b8de
Add: [Actions] Debian Bullseye release build ( #8921 )
2021-04-01 20:45:13 +01:00
Patric Stout
9639e77297
Fix: [Actions] "is-tag" variable is the 5th element, not 6th
...
The 6th is "is-stable-tag", but it is currently broken in meaning.
Betas and RCs are considered "stable", but final releases are not.
This is the reason it was working for RC1, but not for the final
release.
2021-04-01 13:26:34 +02:00
Patric Stout
64a8c38d2f
Fix: [Actions] update environment variable for AWS region ( #8827 )
2021-03-08 23:31:45 +01:00
Jonathan G Rennison
92eb93561c
Github: Add workflow dispatch trigger for CI builds
2021-03-04 17:31:27 +00:00
Jonathan G Rennison
eab32e8861
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# src/blitter/32bpp_optimized.cpp
# src/lang/serbian.txt
2021-03-04 15:33:52 +00:00
glx22
db0993f500
Change: [Actions] Also check dedicated build
2021-03-04 16:22:58 +01:00
Jonathan G Rennison
26dcd0734e
Github: Disable release upload jobs
2021-03-02 23:45:08 +00:00
Jonathan G Rennison
d7b76df1f5
Github: Fix revision logging in release workflow
2021-03-02 22:57:29 +00:00
Jonathan G Rennison
6482a48099
Github: Adjust version file info in release workflow
2021-03-02 20:05:35 +00:00
Jonathan G Rennison
84a7ab180e
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/company_cmd.cpp
# src/lang/greek.txt
# src/table/settings.ini
2021-03-02 13:46:42 +00:00
Jonathan G Rennison
f4e29071be
Merge tag '1.11.0-beta2' into jgrpp
...
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/release.yml
# CMakeLists.txt
# src/blitter/32bpp_optimized.cpp
# src/debug.cpp
# src/gfx.cpp
# src/gfx_func.h
# src/lang/czech.txt
# src/lang/english.txt
# src/lang/italian.txt
# src/lang/swedish.txt
# src/lang/ukrainian.txt
# src/network/network_server.cpp
# src/os/windows/crashlog_win.cpp
# src/os/windows/win32.cpp
# src/pathfinder/follow_track.hpp
# src/screenshot.cpp
# src/settings_type.h
# src/spritecache.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/video_driver.cpp
# src/video/video_driver.hpp
# src/video/win32_v.cpp
2021-03-02 11:59:03 +00:00
glx22
cd4c8ecbf3
Add: [Actions] Allow partial cache invalidation on dependencies change
2021-03-01 22:41:48 +01:00
dP
b284d34277
Add: Support Zstandard(zstd) savegame compression
...
(cherry picked from commit 6f0aeaf2c5436550c93205e704624957e9abc969)
2021-03-01 18:08:28 +00:00
glx22
70e4845915
Change: [Actions] Use only CMake, CTest and CPack
2021-02-24 17:54:24 +01:00
glx22
90adac8f09
Change: [Actions] stop using 'run-vcpkg' action for Release
2021-02-24 17:54:24 +01:00
glx22
58640824d1
Change: [Actions] stop using 'run-cmake' action for Release
2021-02-24 17:54:24 +01:00
glx22
2fd2950eb5
Change: [Actions] stop using 'run-vcpkg' action for CI
2021-02-24 17:54:24 +01:00
glx22
30ae019095
Change: [Actions] stop using 'run-cmake' action for CI
2021-02-24 17:54:24 +01:00
Jonathan G Rennison
68a0a4d1b9
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/newgrf_config.cpp
2021-02-19 20:34:14 +00:00
Patric Stout
b124c49ea4
Fix: [Actions] Also run CI against libsdl1.2 for every pull request
2021-02-19 19:56:40 +01:00
Jonathan G Rennison
e95216b59d
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/company_cmd.cpp
# src/core/geometry_func.cpp
# src/date.cpp
# src/genworld_gui.cpp
# src/gfx.cpp
# src/object_gui.cpp
# src/openttd.cpp
# src/settings_type.h
# src/video/allegro_v.cpp
# src/video/dedicated_v.cpp
# src/video/null_v.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
2021-02-19 15:38:34 +00:00
Patric Stout
cb8e1706b2
Fix: [Actions] if SDL2 is installed, it is always picked over SDL1
...
So no need to install both SDL1 and SDL2, that gives a false idea
of reality.
2021-02-19 11:34:00 +01:00
Patric Stout
d3df4674f9
Fix: [Actions] build our allegro driver too in our CI
...
This prevents us breaking it without realising.
2021-02-19 11:34:00 +01:00
Owen Rudge
d3b50b9c47
Fix: [Actions] Use vcpkg to provide libpng on macOS
2021-02-15 12:10:11 +00:00
Michael Lutz
6755ff63e1
Add: [OSX] Native font rendering without using FreeType.
2021-02-14 11:48:58 +01:00
glx22
f181037bed
Change: [Actions] Also run CI for VS2017
2021-02-13 17:31:57 +01:00
Owen Rudge
395e015282
Change: Convert .md to .rtf for Windows/Mac packages
2021-02-08 23:23:24 +00:00
Owen Rudge
da4c404f3d
Fix: [Actions] Use same vcpkg commit for CI on macOS as release builds
2021-02-08 16:13:03 +00:00
Patric Stout
4f0692c437
Codechange: [Actions] Document better why we build our own fluidsynth ( #8646 )
...
nielsmh nicely correct us in #8641 , pointing out the old comment
is not telling a complete truth. The result is the same, but it
is better to not mislead future-us.
2021-02-05 23:56:44 +01:00
Patric Stout
a667ed945f
Add: [Actions] Automatically upload releases to Steam ( #8644 )
2021-02-05 20:58:15 +01:00
Patric Stout
05df7996a4
Feature: [Actions / CMake] support for generic linux builds ( #8641 )
...
These bundles can be opened on any "modern" Linux machine with
a driver that SDL2 supports.
Machines needs at least glibc 2.15, which was released 10 years ago.
It is build with CentOS 7 as base, and only assumes the following
libraries are available on the system:
- libc
- libdl
- libgcc_s
- libpthread
- librt
- libstdc++
All other libraries the game depends on are bundled together with
the game, so users don't need any library installed to use this
bundle. The downside of course is that this increases the binary
size a bit: 30 MiB of libraries are in this bundle.
RPATH is used to make ld-linux find the folder libraries are
stored in; however, system libraries are always used before these,
in the assumption libraries on the user system are more up-to-date.
Using -DOPTION_PACKAGE_DEPENDENCIES=ON switches on packaging
of libraries in the "lib" folder. This requires CMake 3.16 to
be installed; otherwise it will fail.
2021-02-05 12:31:27 +01:00
Jonathan G Rennison
650d5e014e
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/ai/ai_gui.cpp
# src/company_cmd.cpp
# src/lang/estonian.txt
# src/lang/german.txt
# src/lang/hungarian.txt
# src/lang/korean.txt
# src/lang/slovak.txt
# src/main_gui.cpp
# src/video/sdl2_v.cpp
2021-02-01 19:34:30 +00:00
Jonathan G Rennison
7154f8859d
Merge tag '1.11.0-beta1' into jgrpp
...
# Conflicts:
# src/console_cmds.cpp
# src/gfx_func.h
# src/industry.h
# src/lang/czech.txt
# src/lang/estonian.txt
# src/lang/german.txt
# src/lang/indonesian.txt
# src/lang/japanese.txt
# src/lang/norwegian_bokmal.txt
# src/lang/russian.txt
# src/lang/slovak.txt
# src/saveload/saveload.h
# src/station_gui.cpp
# src/town_gui.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/waypoint_gui.cpp
2021-02-01 18:58:36 +00:00
Jonathan G Rennison
b7ddd486cf
Merge branch 'master' into jgrpp
...
# Conflicts:
# cmake/CompileFlags.cmake
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/cargopacket.cpp
# src/cheat_gui.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/core/pool_func.hpp
# src/date.cpp
# src/economy.cpp
# src/error_gui.cpp
# src/ground_vehicle.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/industry_cmd.cpp
# src/lang/dutch.txt
# src/lang/french.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/mcf.cpp
# src/network/network_content.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/newgrf_engine.cpp
# src/newgrf_station.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/station_cmd.cpp
# src/station_kdtree.h
# src/string_func.h
# src/table/settings.ini
# src/tgp.cpp
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/train_gui.cpp
# src/tree_gui.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
# src/viewport.cpp
# src/viewport_sprite_sorter_sse4.cpp
# src/window.cpp
2021-02-01 17:07:34 +00:00
Jonathan G Rennison
6c3e5642f8
Merge branch 'master' into jgrpp
...
# Conflicts:
# cmake/CompileFlags.cmake
# src/crashlog.cpp
# src/fileio.cpp
# src/fileio_func.h
# src/fios_gui.cpp
# src/ini_load.cpp
# src/ini_type.h
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/network/network_client.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/os/windows/win32.cpp
# src/road_cmd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/settings.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/table/settings.ini
# src/tree_cmd.cpp
# src/tree_gui.cpp
# src/vehicle_base.h
# src/video/cocoa/cocoa_v.mm
# src/video/cocoa/event.mm
# src/video/cocoa/wnd_quartz.mm
# src/viewport.cpp
# src/widgets/tree_widget.h
2021-01-31 01:08:35 +00:00
Jonathan G Rennison
39df1c49a1
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fileio.cpp
# src/group_gui.cpp
# src/industry.h
# src/lang/korean.txt
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/linkgraphjob.h
# src/linkgraph/linkgraphschedule.cpp
# src/linkgraph/linkgraphschedule.h
# src/openttd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/town_cmd.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
2021-01-30 18:27:35 +00:00
Jonathan G Rennison
cb69611248
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/changelog.sh
# cmake/PackageDeb.cmake
# src/network/network_client.cpp
# src/settings_gui.cpp
2021-01-29 18:27:36 +00:00
Jonathan G Rennison
43980639de
Merge branch 'master' into jgrpp
...
# Conflicts:
# .gitignore
# CMakeLists.txt
# src/3rdparty/optional/optional.hpp
# src/group_cmd.cpp
# src/industry_cmd.cpp
# src/misc_gui.cpp
# src/video/sdl2_v.cpp
2021-01-29 17:45:15 +00:00
Patric Stout
4831b4fa96
Codechange: [Actions] we no longer need xdg-basedir ( #8615 )
...
This was already removed from the "ci-build", but not yet from
"release".
2021-01-29 10:38:58 +01:00
Owen Rudge
1187dc3217
Feature: [Actions] Create .zip for macOS build
2021-01-28 19:15:36 +00:00
Owen Rudge
a2bd0a14e1
Feature: [Actions] ARM64 builds for Windows
2021-01-18 08:57:58 +00:00
Owen Rudge
2d9e164ec4
Fix: [Actions] Give Universal Mac packages the "universal" suffix
2021-01-18 08:57:39 +00:00
Owen Rudge
ce42e819b9
Feature: Build macOS build as a universal binary
2021-01-15 20:26:59 +00:00
Owen Rudge
bc8f347ef2
Fix: vcpkg binaries were not being cached on Mac
2021-01-14 12:10:23 +00:00
Patric Stout
cc5f190cb3
Fix: [Actions] circumvent Windows tar warning about read-only files ( #8570 )
...
This was already applied on the CI build, but not yet on the
release build.
2021-01-14 11:26:13 +01:00
Owen Rudge
4f5990fa26
Fix: Remove .sha256 files from macOS builds
2021-01-14 09:30:16 +00:00
Owen Rudge
60851ef1a6
Feature: Sign macOS builds
2021-01-13 13:45:52 +00:00
frosch
f6abc81cf1
Fix: add missing variables to NewGRF inspect window.
2021-01-10 21:24:38 +01:00
Owen Rudge
fec5ce093f
Feature: Build ARM64 (Apple Silicon) version for macOS
2021-01-08 16:58:14 +00:00
Patric Stout
4059ccf863
Fix: [Actions] circumvent Windows tar warning about read-only files ( #8524 )
...
Because certain files are read-only, the "restore-cache" step
fails, as Windows tar refuses to overwrite those files (even
if they are identical). Instead of hoping upstream fixes
"restore-cache", just remove the read-only flag on these files
instead.
2021-01-08 15:20:27 +01:00
Charles Pigott
3dfee979a7
Codechange: Drop libxdg-basedir dependency in favour of finding the directories ourselves
2021-01-02 19:46:08 +00:00
Jonathan G Rennison
483ed2f468
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/commit-checker.yml
# src/openttd.cpp
2020-12-27 20:16:16 +00:00
Patric Stout
f2d78b11dd
Fix: [Actions] cmakeBuildType is only used with CMakeListsTxtBasic ( #8435 )
...
We use CMakeListsTxtAdvanced, and as such, we have to do this our
self via "-DCMAKE_BUILD_TYPE=RelWithDebInfo". Otherwise we are
producing Debug builds instead of Release builds. Oops.
2020-12-26 13:48:57 +01:00
frosch
3f606691a8
Add: [GitHub] PR template. ( #8414 )
2020-12-22 22:39:24 +01:00
Patric Stout
7ea5904395
Add: [Actions] release workflow for both releases and nightlies
...
This has several ways of being triggered:
- When creating a new release via the GitHub interface. Fully
automated that will produce new binaries, upload them, and it
will even update the website to tell about the new version.
- When triggered in an automated way from OpenTTD/workflows to
start a nightly.
- Manually via the Release workflow, which accepts branches,
Pull Requests and tags to build.
Rerunning a job is safe and should be without issues. Everything
retriggers and updates what-ever might have been broken. In fact,
except for dates, it should produce identical results.
Co-authored-by: Charles Pigott <charlespigott@googlemail.com>
2020-12-19 18:26:29 +01:00
Patric Stout
93ef759a25
Add: [Actions] preview workflow, where PRs can be reviewed in the browser
...
When a developer attaches the "preview" label, a build is created
and published on https://preview.openttd.org/ . After that, new
pushes to the PR are automatically build (as long as the "preview"
label exists).
If a non-developer attaches the "preview" label, it will be
removed.
2020-12-15 15:46:39 +01:00
Patric Stout
d15dc9f40f
Add: support for emscripten (play-OpenTTD-in-the-browser)
...
Emscripten compiles to WASM, which can be loaded via
HTML / JavaScript. This allows you to play OpenTTD inside a
browser.
Co-authored-by: milek7 <me@milek7.pl>
2020-12-15 15:46:39 +01:00
Patric Stout
abb746fae3
Fix: [Actions] cleanup ci-build workflow to be up-to-date ( #8375 )
...
Also, while at it, make it more like the upcoming release-workflow,
so they look a lot more similar.
Functional it should be the same, except that Windows should
now also output when a test fails.
2020-12-13 22:32:44 +01:00
Jonathan G Rennison
5aac3d71ee
Github: Remove regression tests from build workflow
2020-12-13 15:32:29 +00:00
Jonathan G Rennison
0d46b5e88a
Github: Remove commit checker workflow
2020-12-13 15:32:11 +00:00
glx22
e2eafd86de
Fix: Prevent infinite recursion in commit checker
2020-12-10 01:08:44 +01:00
Charles Pigott
13e1b13a4e
Fix: [Actions] Call apt-get update before trying to install packages
2020-10-10 15:02:06 +01:00
Charles Pigott
2073c8d67f
Add: [Actions] Add problem matchers for CI platforms
2020-10-10 15:02:06 +01:00
glx
5af98c69e6
Add: [Actions] CI build workflow
2020-10-03 16:17:11 +01:00
glx
fb3de33a38
Add: [Actions] commit-checker workflow
2020-01-19 09:05:20 +00:00
Roger
1be42c6cb8
Add: [GitHub] sponsor button on github.com ( #7700 )
2019-08-31 21:20:24 +02:00
PeterN
498ca6e4eb
Add: [GitHub] Add issue template to encourage better issue reporting. ( #7137 )
2019-01-29 18:15:54 +01:00
Patric Stout
564077719a
Add: [GitHub] enable probot/stale, to flush out stale issues/pull requests
...
Stale bot checks if an issue hasn't had any attention in the last
60 days, or if a pull request hasn't had any attention in the last
30 days. If so, it marks it as stale. After 7 more days, it closes
the issue/pull request. Any activity on the issue/pull request
resets the timer.
This helps keeping the counter low, and the work manageable. There
is a lot of reasoning behind this idea, and other projects show it
really helps to keep the issue/pull request count low.
More information here: https://github.com/probot/stale
2019-01-24 21:57:06 +01:00