Commit Graph

6 Commits

Author SHA1 Message Date
Jonathan G Rennison
0150f8f570 Merge branch 'master' into jgrpp
# Conflicts:
#	src/network/network_server.cpp
2024-04-18 17:37:25 +01:00
glx22
64a67d8821 Change: [CI] Always use latest stable Xcode
(cherry picked from commit d750db9bbefe853002edea59ad72ca37a4702b6c)
2024-03-28 16:15:52 +00:00
merni-ns
4c0dca1411 Codechange: [CI] Move Release CI build to MacOS runner (#12309) 2024-03-16 15:11:23 +01:00
Jonathan G Rennison
fe730bce31 Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/codeql.yml
#	.github/workflows/release-linux.yml
#	.github/workflows/release-macos.yml
#	.github/workflows/release-windows.yml
#	src/map.cpp
#	src/music/midifile.hpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/pbs.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/script/api/script_text.cpp
#	src/ship_cmd.cpp
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_func.h
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/viewport.cpp
#	src/waypoint_cmd.cpp
2024-03-12 17:44:28 +00:00
Patric Stout
d7b99cbe26 Codefix: [CI] Store vcpkg outside the repository folder (#12271)
Otherwise tools like CodeQL can pick up on vcpkg files.
2024-03-11 18:53:09 +00:00
Patric Stout
ee22fa34d7 Codechange: [CI] Split the ci-build into smaller components 2024-03-11 15:44:30 +01:00