Merge branch 'master' into jgrpp

# Conflicts:
#	src/landscape.cpp
#	src/lang/frisian.txt
#	src/lang/korean.txt
#	src/lang/russian.txt
This commit is contained in:
Jonathan G Rennison
2022-10-22 10:08:16 +01:00
67 changed files with 292 additions and 91 deletions

View File

@@ -179,7 +179,7 @@ jobs:
- name: Prepare cache key
id: key
run: |
echo "::set-output name=image::$ImageOS-$ImageVersion"
echo "image=$ImageOS-$ImageVersion" >> $GITHUB_OUTPUT
- name: Enable vcpkg cache
uses: actions/cache@v3
@@ -257,7 +257,7 @@ jobs:
# Work around caching failure with GNU tar
New-Item -Type Junction -Path vcpkg -Target c:\vcpkg
Write-Output "::set-output name=image::$env:ImageOS-$env:ImageVersion"
Write-Output "image=$env:ImageOS-$env:ImageVersion" >> $env:GITHUB_OUTPUT
- name: Enable vcpkg cache
uses: actions/cache@v3
@@ -400,4 +400,4 @@ jobs:
steps:
- name: Check annotations
uses: OpenTTD/actions/annotation-check@v2
uses: OpenTTD/actions/annotation-check@v3