Commit Graph

114 Commits (38571cf0daea6f9e4ec56f489df0c9a282ef94f4)

Author SHA1 Message Date
Jonathan G Rennison 38571cf0da Merge branch 'master' into jgrpp
# Conflicts:
#	src/landscape.cpp
#	src/lang/frisian.txt
#	src/lang/korean.txt
#	src/lang/russian.txt
2 years ago
glx22 87d1bd895a Fix f6530f3c2: [Actions] set-output was not correctly converted 2 years ago
glx22 8ffe59373f Update: [Actions] use annotation-check v3 2 years ago
Loïc Guilloux f6530f3c2d
Codechange: [Actions] set-output is deprecated (#10089) 2 years ago
Jonathan G Rennison 142a5a95ec Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/release.yml
#	src/goal_cmd.h
#	src/industry_cmd.cpp
2 years ago
Aaron Katzin 2fe8a257ac
Add: [Actions] Ubuntu Jammy Jellyfish (22.04) build for releases (#9881) 2 years ago
Jonathan G Rennison 13557d868a Disable uninitialised warnings for MSYS/MinGW CI build 2 years ago
Jonathan G Rennison 5b7db9d849 Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/commit-checker.yml
#	src/command.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/crashlog.cpp
#	src/economy.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/misc_gui.cpp
#	src/newgrf_config.cpp
#	src/openttd.cpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/table/settings/gui_settings.ini
2 years ago
Frazer Smith 9bdc1e8f04 Update: bump peter-evans/repository-dispatch from 1 to 2 2 years ago
Frazer Smith 19b838dd60 Update: bump actions/download-artifact from 2 to 3 2 years ago
Frazer Smith 9162ac9d37 Update: bump actions/checkout from 2 to 3 2 years ago
Frazer Smith 2a2f80bb71 Update: bump actions/cache from 2 to 3 2 years ago
Frazer Smith 33dabc42bb Update: bump actions/upload-artifact from 2 to 3 2 years ago
Owen Rudge 5a6ea11ead Feature: [Actions] Package builds for the Windows Store automatically 2 years ago
Jonathan G Rennison 34af4844d1 Merge branch 'master' into jgrpp 2 years ago
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.
2 years ago
Owen Rudge 1bfbcff71e Change: [Actions] Switch back to primary source for 'gon' in macOS build job
This reverts commit 7a97a33598.
2 years ago
Owen Rudge 7a97a33598 Fix: [Actions] Switch source for 'gon' in macOS build job 2 years ago
Loïc Guilloux 1a17b6c8f6
Change: [Actions] Remove VS2017 and restore VS2019 for CI (#9835) 2 years ago
Jonathan G Rennison 16e4b84a2f Github: Disable installing gon in OSX release build 2 years ago
Jonathan G Rennison e5ae88e8ea Github: Disable import windows signing cert in release workflow 2 years ago
Jonathan G Rennison 3645bcfe62 Github: Disable auto-running of release workflow 2 years ago
Jonathan G Rennison 1c7f6b97a5 Update Github release file to fix compile and distro issues 2 years ago
Jonathan G Rennison 0691b25e17 Merge branch 'master' into jgrpp
# Conflicts:
#	src/saveload/afterload.cpp
3 years ago
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.
3 years ago
Jonathan G Rennison 656c596c33 Disable fetching MacOS code signing certs in release workflow 3 years ago
Jonathan G Rennison f79977ad0b Disable signing installer in release workflow 3 years ago
Jonathan G Rennison 49228a5ee4 Disable unused strings check on PRs for now
See: #333
3 years ago
Jonathan G Rennison e5668cb9ad CI: Remove regression test from MSYS job 3 years ago
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
3 years ago
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
3 years ago
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
3 years ago
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
3 years ago
glx22 14429bbe8a Change: [Actions] Also check desync debug 3 years ago
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.
3 years ago
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.
3 years ago
Loïc Guilloux 46123742f5
Change: [Actions] Use macOS-11 image for releases (#9605) 3 years ago
Patric Stout 3046a6ce39
Change: upgrade Emscripten to 2.0.31 and enable LZMA by default (#9604) 3 years ago
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
3 years ago
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
3 years ago
Patric Stout 9c74dc2468
Codechange: validate that all STR_NNN strings are defined and used (#9518) 3 years ago
Patric Stout b67ef1e5b8
Fix: [Actions] Ubuntu 18.04 by default has a compiler too old for OpenTTD (#9481) 3 years ago
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.
3 years ago
Loïc Guilloux f86c66cbd7
Codechange: [Actions] Improve MSYS2 setup time (#9360) 3 years ago
Loïc Guilloux acb6348ba6
Add: [Actions] msys2/MinGW CI (#8698) 3 years ago
Owen Rudge 3ce7e31f64 Feature: Sign Windows builds 3 years ago
Patric Stout 3477405e86
Change: [Actions] use newly created Actions instead of custom shell-scripting (#9284) 3 years ago
Loïc Guilloux c53d9991ee
Add: [Actions] Check CI annotations to detect compile warnings (#9217) 3 years ago
Loïc Guilloux 282d5d302d
Change: [Actions] Add a 2 minutes timeout for regression test (#9166) 3 years ago
Jonathan G Rennison d0159f2452 Github: Disable CI build workflow on push to master 3 years ago