dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	.github/workflows/release.yml
#	src/goal_cmd.h
#	src/industry_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2022-09-01 17:47:30 +01:00
parent dc5e073379 c839950791
commit 142a5a95ec
3 changed files with 79 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/release.yml vendored
View File

@@ -380,8 +380,8 @@ jobs:
bundle_name: "focal"
compiler: "g++"
c_compiler: "gcc"
- container_image: "ubuntu:21.10"
bundle_name: "impish"
- container_image: "ubuntu:22.04"
bundle_name: "jammy"
compiler: "g++"
c_compiler: "gcc"
- container_image: "debian:buster"