Skip to content

Commit 2228095

Browse files
authored
Merge branch 'master' into sidequest/frontier-distance-static-blockers
2 parents 7946d6c + 1813dfc commit 2228095

58 files changed

Lines changed: 372 additions & 207 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/release.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ jobs:
2323
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2424
- name: Extract tag name
2525
id: get_tag
26-
run: echo "::set-output name=tag::${GITHUB_REF#refs/tags/}"
26+
run: echo "tag=${GITHUB_REF#refs/tags/}" >> "$GITHUB_OUTPUT"
2727
- name: Set filenames
2828
id: filenames
2929
run: |
30-
echo "::set-output name=src::s25client_src_${{steps.get_tag.outputs.tag}}.tar.gz"
31-
echo "::set-output name=devTools::s25client_dev-tools_${{steps.get_tag.outputs.tag}}.tar.gz"
30+
echo src=s25client_src_${{steps.get_tag.outputs.tag}}.tar.gz" >> "$GITHUB_OUTPUT"
31+
echo "devTools=s25client_dev-tools_${{steps.get_tag.outputs.tag}}.tar.gz" >> "$GITHUB_OUTPUT"
3232
- name: Create source distribution
3333
run: |
3434
set -x
@@ -64,7 +64,6 @@ jobs:
6464
id: create_release
6565
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
6666
with:
67-
token: ${{ secrets.GITHUB_TOKEN }}
6867
tag_name: ${{ github.ref }}
6968
name: Release ${{ github.ref }}
7069
body: |

.github/workflows/static-analysis.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@ permissions:
88

99
on:
1010
push:
11+
branches:
12+
- master
13+
- main
14+
- develop
15+
- bugfix/**
16+
- feature/**
17+
- fix/**
18+
- pr/**
1119
pull_request:
1220

1321
concurrency:
@@ -36,7 +44,7 @@ jobs:
3644
- name: Lint markdown files
3745
uses: avto-dev/markdown-lint@04d43ee9191307b50935a753da3b775ab695eceb # v1.5.0
3846
with:
39-
ignore: external data/RTTR/MAPS .
47+
args: doc/
4048
- name: Check licensing
4149
run:
4250
pip install --user reuse

.github/workflows/unit-tests.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ env:
3131
jobs:
3232
Windows:
3333
strategy:
34+
fail-fast: false
3435
matrix:
3536
include:
3637
- { os: windows-2022, generator: Visual Studio 17 2022, type: Debug, platform: Win32}
@@ -71,6 +72,7 @@ jobs:
7172

7273
Linux:
7374
strategy:
75+
fail-fast: false
7476
matrix:
7577
include:
7678
# MacOSX:

CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,6 @@
33
# SPDX-License-Identifier: GPL-2.0-or-later
44

55
cmake_minimum_required(VERSION 3.16..3.31)
6-
if(POLICY CMP0177)
7-
cmake_policy(SET CMP0177 NEW) # Normalize install() DESTINATION paths
8-
endif()
9-
if(POLICY CMP0167)
10-
cmake_policy(SET CMP0167 OLD) # FindBoost is removed, keep for now
11-
endif()
126

137
if(NOT RTTR_VERSION)
148
string(TIMESTAMP RTTR_VERSION "%Y%m%d")

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ You can configure (run CMake) with `-DRTTR_INCLUDE_DEVTOOLS=ON` to allow CMake t
5454
- C++14 compatible compiler (e.g. GCC-6)
5555
- cmake
5656
- git
57-
- libboost-dev (at least v1.69.0, i.e <http://www.boost.org/>)
58-
or only: libboost-test-dev libboost-locale-dev, libboost-iostreams-dev, libboost-filesystem-dev, libboost-program-options-dev (at least v1.69.0)
57+
- libboost-dev (at least v1.71.0, i.e <http://www.boost.org/>)
58+
or only: libboost-test-dev libboost-locale-dev, libboost-iostreams-dev, libboost-filesystem-dev, libboost-program-options-dev (at least v1.71.0)
5959
- libsdl2-dev
6060
- libsdl2-mixer-dev
6161
- libcurl-dev (in libcurl4-openssl-dev)

external/libendian

external/mygettext

0 commit comments

Comments
 (0)