games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-22 22:13:35 +02:00
Code Issues Releases Activity

Merge pull request #3988 from IvanSavenko/ubuntu_24_04_runner

Browse Source 
[1.5.2] Use Ubuntu 24.04 runner for some presets
This commit is contained in:
Ivan Savenko 2024-05-19 15:42:18 +03:00 committed by GitHub
commit fd74d5391e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/github.yml vendored
View File

@ -20,11 +20,11 @@ jobs:
matrix: matrix:
include: include:
- platform: linux-qt6 - platform: linux-qt6
os: ubuntu-22.04 os: ubuntu-24.04
test: 0 test: 0
preset: linux-clang-test preset: linux-clang-test
- platform: linux - platform: linux
os: ubuntu-22.04 os: ubuntu-24.04
test: 1 test: 1
preset: linux-gcc-test preset: linux-gcc-test
- platform: linux - platform: linux
@ -124,7 +124,7 @@ jobs:
# also, running it on multiple presets is redundant and slightly increases already long CI built times # also, running it on multiple presets is redundant and slightly increases already long CI built times
if: ${{ startsWith(matrix.preset, 'linux-clang-test') }} if: ${{ startsWith(matrix.preset, 'linux-clang-test') }}
run: | run: |
pip3 install jstyleson sudo apt install python3-jstyleson
python3 CI/linux-qt6/validate_json.py python3 CI/linux-qt6/validate_json.py
- name: Dependencies - name: Dependencies
@ -201,8 +201,8 @@ jobs:
- name: Configure - name: Configure
run: | run: |
if [[ ${{matrix.preset}} == linux-gcc-test ]]; then GCC12=1; fi if [[ ${{matrix.preset}} == linux-gcc-test ]]; then GCC14=1; fi
cmake -DENABLE_CCACHE:BOOL=ON --preset ${{ matrix.preset }} ${GCC12:+-DCMAKE_C_COMPILER=gcc-12 -DCMAKE_CXX_COMPILER=g++-12} cmake -DENABLE_CCACHE:BOOL=ON --preset ${{ matrix.preset }} ${GCC14:+-DCMAKE_C_COMPILER=gcc-14 -DCMAKE_CXX_COMPILER=g++-14}
- name: Build - name: Build
run: | run: |

14
AI/Nullkiller/Goals/CGoal.h
View File

@ -18,10 +18,11 @@ class AIGateway;
namespace Goals namespace Goals
{ {
template<typename T> class DLL_EXPORT CGoal : public AbstractGoal template<typename T>
class DLL_EXPORT CGoal : public AbstractGoal
{ {
public: public:
CGoal<T>(EGoals goal = INVALID) : AbstractGoal(goal) CGoal(EGoals goal = INVALID) : AbstractGoal(goal)
{ {
isAbstract = true; isAbstract = true;
value = 0; value = 0;
@ -32,7 +33,7 @@ namespace Goals
town = nullptr; town = nullptr;
} }
CGoal<T> * clone() const override CGoal * clone() const override
{ {
return new T(static_cast<T const &>(*this)); //casting enforces template instantiation return new T(static_cast<T const &>(*this)); //casting enforces template instantiation
} }
@ -70,15 +71,16 @@ namespace Goals
} }
}; };
template<typename T> class DLL_EXPORT ElementarGoal : public CGoal<T>, public ITask template<typename T>
class DLL_EXPORT ElementarGoal : public CGoal<T>, public ITask
{ {
public: public:
ElementarGoal<T>(EGoals goal = INVALID) : CGoal<T>(goal), ITask() ElementarGoal(EGoals goal = INVALID) : CGoal<T>(goal), ITask()
{ {
AbstractGoal::isAbstract = false; AbstractGoal::isAbstract = false;
} }
ElementarGoal<T>(const ElementarGoal<T> & other) : CGoal<T>(other), ITask(other) ElementarGoal(const ElementarGoal<T> & other) : CGoal<T>(other), ITask(other)
{ {
} }

7
AI/VCAI/Goals/CGoal.h
View File

@ -18,10 +18,11 @@ class VCAI;
namespace Goals namespace Goals
{ {
template<typename T> class DLL_EXPORT CGoal : public AbstractGoal template<typename T>
class DLL_EXPORT CGoal : public AbstractGoal
{ {
public: public:
CGoal<T>(EGoals goal = INVALID) : AbstractGoal(goal) CGoal(EGoals goal = INVALID) : AbstractGoal(goal)
{ {
priority = 0; priority = 0;
isElementar = false; isElementar = false;
@ -56,7 +57,7 @@ namespace Goals
return f->evaluate(static_cast<T &>(*this)); //casting enforces template instantiation return f->evaluate(static_cast<T &>(*this)); //casting enforces template instantiation
} }
CGoal<T> * clone() const override CGoal * clone() const override
{ {
return new T(static_cast<T const &>(*this)); //casting enforces template instantiation return new T(static_cast<T const &>(*this)); //casting enforces template instantiation
} }