mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-29 05:34:33 +00:00
Code Issues Releases Wiki Activity

Bump cache keys

Browse source
This commit is contained in:
Evil Eye 2025-09-22 21:28:52 +02:00
parent b15ae08a07
commit 4847995861
4 changed files with 30 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
.gitlab-ci.yml
View file

@ -36,7 +36,7 @@ variables:
Ubuntu_GCC_preprocess: Ubuntu_GCC_preprocess:
extends: .Ubuntu_Image extends: .Ubuntu_Image
cache: cache:
key: Ubuntu_GCC_preprocess.ubuntu_24.04.v1 key: Ubuntu_GCC_preprocess.ubuntu_24.04.v2
paths: paths:
- apt-cache/ - apt-cache/
- .cache/pip/ - .cache/pip/
@ -105,7 +105,7 @@ Coverity:
rules: rules:
- if: $CI_PIPELINE_SOURCE == "schedule" - if: $CI_PIPELINE_SOURCE == "schedule"
cache: cache:
key: Coverity.ubuntu_24.04.v1 key: Coverity.ubuntu_24.04.v2
paths: paths:
- apt-cache/ - apt-cache/
- ccache/ - ccache/
@ -161,7 +161,7 @@ Coverity_Upload:
Ubuntu_GCC: Ubuntu_GCC:
extends: .Ubuntu extends: .Ubuntu
cache: cache:
key: Ubuntu_GCC.ubuntu_24.04.v1 key: Ubuntu_GCC.ubuntu_24.04.v2
before_script: before_script:
- CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic
variables: variables:
@ -174,7 +174,7 @@ Ubuntu_GCC:
Ubuntu_GCC_asan: Ubuntu_GCC_asan:
extends: Ubuntu_GCC extends: Ubuntu_GCC
cache: cache:
key: Ubuntu_GCC_asan.ubuntu_24.04.v1 key: Ubuntu_GCC_asan.ubuntu_24.04.v2
variables: variables:
CMAKE_BUILD_TYPE: Debug CMAKE_BUILD_TYPE: Debug
CMAKE_CXX_FLAGS_DEBUG: -g -O1 -fno-omit-frame-pointer -fsanitize=address -fsanitize=pointer-subtract -fsanitize=leak CMAKE_CXX_FLAGS_DEBUG: -g -O1 -fno-omit-frame-pointer -fsanitize=address -fsanitize=pointer-subtract -fsanitize=leak
@ -187,7 +187,7 @@ Clang_Format:
extends: .Ubuntu_Image extends: .Ubuntu_Image
stage: checks stage: checks
cache: cache:
key: Ubuntu_Clang_Format.ubuntu_24.04.v1 key: Ubuntu_Clang_Format.ubuntu_24.04.v2
paths: paths:
- apt-cache/ - apt-cache/
variables: variables:
@ -203,7 +203,7 @@ Lupdate:
extends: .Ubuntu_Image extends: .Ubuntu_Image
stage: checks stage: checks
cache: cache:
key: Ubuntu_lupdate.ubuntu_24.04.v1 key: Ubuntu_lupdate.ubuntu_24.04.v2
paths: paths:
- apt-cache/ - apt-cache/
variables: variables:
@ -229,7 +229,7 @@ Teal:
Ubuntu_GCC_Debug: Ubuntu_GCC_Debug:
extends: .Ubuntu extends: .Ubuntu
cache: cache:
key: Ubuntu_GCC_Debug.ubuntu_24.04.v2 key: Ubuntu_GCC_Debug.ubuntu_24.04.v3
before_script: before_script:
- CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic
variables: variables:
@ -245,7 +245,7 @@ Ubuntu_GCC_Debug:
Ubuntu_GCC_tests: Ubuntu_GCC_tests:
extends: Ubuntu_GCC extends: Ubuntu_GCC
cache: cache:
key: Ubuntu_GCC_tests.ubuntu_24.04.v1 key: Ubuntu_GCC_tests.ubuntu_24.04.v2
variables: variables:
CCACHE_SIZE: 1G CCACHE_SIZE: 1G
BUILD_TESTS_ONLY: 1 BUILD_TESTS_ONLY: 1
@ -259,7 +259,7 @@ Ubuntu_GCC_tests:
.Ubuntu_GCC_tests_Debug: .Ubuntu_GCC_tests_Debug:
extends: Ubuntu_GCC extends: Ubuntu_GCC
cache: cache:
key: Ubuntu_GCC_tests_Debug.ubuntu_24.04.v1 key: Ubuntu_GCC_tests_Debug.ubuntu_24.04.v2
variables: variables:
CCACHE_SIZE: 1G CCACHE_SIZE: 1G
BUILD_TESTS_ONLY: 1 BUILD_TESTS_ONLY: 1
@ -275,7 +275,7 @@ Ubuntu_GCC_tests:
Ubuntu_GCC_tests_asan: Ubuntu_GCC_tests_asan:
extends: Ubuntu_GCC extends: Ubuntu_GCC
cache: cache:
key: Ubuntu_GCC_tests_asan.ubuntu_24.04.v1 key: Ubuntu_GCC_tests_asan.ubuntu_24.04.v2
variables: variables:
CCACHE_SIZE: 1G CCACHE_SIZE: 1G
BUILD_TESTS_ONLY: 1 BUILD_TESTS_ONLY: 1
@ -298,7 +298,7 @@ Ubuntu_GCC_tests_asan:
Ubuntu_GCC_tests_ubsan: Ubuntu_GCC_tests_ubsan:
extends: Ubuntu_GCC extends: Ubuntu_GCC
cache: cache:
key: Ubuntu_GCC_tests_ubsan.ubuntu_24.04.v1 key: Ubuntu_GCC_tests_ubsan.ubuntu_24.04.v2
variables: variables:
CCACHE_SIZE: 1G CCACHE_SIZE: 1G
BUILD_TESTS_ONLY: 1 BUILD_TESTS_ONLY: 1
@ -318,7 +318,7 @@ Ubuntu_GCC_tests_ubsan:
.Ubuntu_GCC_tests_tsan: .Ubuntu_GCC_tests_tsan:
extends: Ubuntu_GCC extends: Ubuntu_GCC
cache: cache:
key: Ubuntu_GCC_tests_tsan.ubuntu_24.04.v1 key: Ubuntu_GCC_tests_tsan.ubuntu_24.04.v2
variables: variables:
CCACHE_SIZE: 1G CCACHE_SIZE: 1G
BUILD_TESTS_ONLY: 1 BUILD_TESTS_ONLY: 1
@ -336,7 +336,7 @@ Ubuntu_GCC_tests_ubsan:
Ubuntu_GCC_tests_coverage: Ubuntu_GCC_tests_coverage:
extends: .Ubuntu_GCC_tests_Debug extends: .Ubuntu_GCC_tests_Debug
cache: cache:
key: Ubuntu_GCC_tests_coverage.ubuntu_24.04.v1 key: Ubuntu_GCC_tests_coverage.ubuntu_24.04.v2
paths: paths:
- .cache/pip - .cache/pip
variables: variables:
@ -369,7 +369,7 @@ Ubuntu_GCC_tests_coverage:
- "CI/**/*" - "CI/**/*"
- ".gitlab-ci.yml" - ".gitlab-ci.yml"
cache: cache:
key: Ubuntu_Static_Deps.ubuntu_24.04.v1 key: Ubuntu_Static_Deps.ubuntu_24.04.v2
paths: paths:
- apt-cache/ - apt-cache/
- ccache/ - ccache/
@ -386,7 +386,7 @@ Ubuntu_GCC_tests_coverage:
.Ubuntu_Static_Deps_tests: .Ubuntu_Static_Deps_tests:
extends: .Ubuntu_Static_Deps extends: .Ubuntu_Static_Deps
cache: cache:
key: Ubuntu_Static_Deps_tests.ubuntu_24.04.v1 key: Ubuntu_Static_Deps_tests.ubuntu_24.04.v2
variables: variables:
CCACHE_SIZE: 1G CCACHE_SIZE: 1G
BUILD_TESTS_ONLY: 1 BUILD_TESTS_ONLY: 1
@ -405,7 +405,7 @@ Ubuntu_Clang:
before_script: before_script:
- CI/install_debian_deps.sh clang openmw-deps openmw-deps-dynamic - CI/install_debian_deps.sh clang openmw-deps openmw-deps-dynamic
cache: cache:
key: Ubuntu_Clang.ubuntu_24.04.v2 key: Ubuntu_Clang.ubuntu_24.04.v3
variables: variables:
CC: clang CC: clang
CXX: clang++ CXX: clang++
@ -418,7 +418,7 @@ Ubuntu_Clang:
before_script: before_script:
- CI/install_debian_deps.sh clang clang-tidy openmw-deps openmw-deps-dynamic - CI/install_debian_deps.sh clang clang-tidy openmw-deps openmw-deps-dynamic
cache: cache:
key: Ubuntu_Clang_Tidy.ubuntu_24.04.v1 key: Ubuntu_Clang_Tidy.ubuntu_24.04.v2
variables: variables:
CMAKE_BUILD_TYPE: Debug CMAKE_BUILD_TYPE: Debug
CMAKE_CXX_FLAGS_DEBUG: -O0 CMAKE_CXX_FLAGS_DEBUG: -O0
@ -476,7 +476,7 @@ Ubuntu_Clang_Tidy_other:
.Ubuntu_Clang_tests: .Ubuntu_Clang_tests:
extends: Ubuntu_Clang extends: Ubuntu_Clang
cache: cache:
key: Ubuntu_Clang_tests.ubuntu_24.04.v1 key: Ubuntu_Clang_tests.ubuntu_24.04.v2
variables: variables:
CCACHE_SIZE: 1G CCACHE_SIZE: 1G
BUILD_TESTS_ONLY: 1 BUILD_TESTS_ONLY: 1
@ -490,7 +490,7 @@ Ubuntu_Clang_Tidy_other:
Ubuntu_Clang_tests_Debug: Ubuntu_Clang_tests_Debug:
extends: Ubuntu_Clang extends: Ubuntu_Clang
cache: cache:
key: Ubuntu_Clang_tests_Debug.ubuntu_24.04.v1 key: Ubuntu_Clang_tests_Debug.ubuntu_24.04.v2
variables: variables:
CCACHE_SIZE: 1G CCACHE_SIZE: 1G
BUILD_TESTS_ONLY: 1 BUILD_TESTS_ONLY: 1
@ -525,7 +525,7 @@ Ubuntu_Clang_integration_tests:
needs: needs:
- Ubuntu_Clang - Ubuntu_Clang
cache: cache:
key: Ubuntu_Clang_integration_tests.ubuntu_24.04.v2 key: Ubuntu_Clang_integration_tests.ubuntu_24.04.v3
variables: variables:
OPENMW_DEPS: openmw-integration-tests OPENMW_DEPS: openmw-integration-tests
@ -534,7 +534,7 @@ Ubuntu_GCC_integration_tests_asan:
needs: needs:
- Ubuntu_GCC_asan - Ubuntu_GCC_asan
cache: cache:
key: Ubuntu_GCC_integration_tests_asan.ubuntu_24.04.v1 key: Ubuntu_GCC_integration_tests_asan.ubuntu_24.04.v2
variables: variables:
OPENMW_DEPS: openmw-integration-tests libasan OPENMW_DEPS: openmw-integration-tests libasan
ASAN_OPTIONS: halt_on_error=1:strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1:detect_leaks=0 ASAN_OPTIONS: halt_on_error=1:strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1:detect_leaks=0
@ -587,7 +587,7 @@ Ubuntu_GCC_integration_tests_asan:
macOS15_Xcode16_amd64: macOS15_Xcode16_amd64:
extends: .MacOS extends: .MacOS
cache: cache:
key: macOS15_Xcode16_amd64.v1 key: macOS15_Xcode16_amd64.v2
variables: variables:
CCACHE_SIZE: 3G CCACHE_SIZE: 3G
DMG_IDENTIFIER: amd64 DMG_IDENTIFIER: amd64
@ -599,7 +599,7 @@ macOS15_Xcode16_amd64:
macOS15_Xcode16_arm64: macOS15_Xcode16_arm64:
extends: .MacOS extends: .MacOS
cache: cache:
key: macOS15_Xcode16_arm64.v1 key: macOS15_Xcode16_arm64.v2
variables: variables:
DMG_IDENTIFIER: arm64 DMG_IDENTIFIER: arm64
CCACHE_SIZE: 3G CCACHE_SIZE: 3G

3
apps/openmw/mwgui/dialogue.hpp
View file

@ -117,8 +117,7 @@ namespace MWGui
{ {
virtual ~DialogueText() = default; virtual ~DialogueText() = default;
virtual void write(std::shared_ptr<BookTypesetter> typesetter, const TopicSearch& keywordSearch, virtual void write(std::shared_ptr<BookTypesetter> typesetter, const TopicSearch& keywordSearch,
std::map<std::string, std::unique_ptr<Link>>& topicLinks) const std::map<std::string, std::unique_ptr<Link>>& topicLinks) const = 0;
= 0;
std::string mText; std::string mText;
}; };

13
apps/openmw/mwgui/journalviewmodel.hpp
View file

@ -76,22 +76,19 @@ namespace MWGui
/// walks over the journal entries related to all quests with the given name /// walks over the journal entries related to all quests with the given name
/// If \a questName is empty, simply visits all journal entries /// If \a questName is empty, simply visits all journal entries
virtual void visitJournalEntries( virtual void visitJournalEntries(
std::string_view questName, std::function<void(JournalEntry const&)> visitor) const std::string_view questName, std::function<void(JournalEntry const&)> visitor) const = 0;
= 0;
/// provides the name of the topic specified by its id /// provides the name of the topic specified by its id
virtual void visitTopicName(const MWDialogue::Topic& topic, std::function<void(std::string_view)> visitor) const virtual void visitTopicName(
= 0; const MWDialogue::Topic& topic, std::function<void(std::string_view)> visitor) const = 0;
/// walks over the topics whose names start with the character /// walks over the topics whose names start with the character
virtual void visitTopicNamesStartingWith( virtual void visitTopicNamesStartingWith(
Utf8Stream::UnicodeChar character, std::function<void(std::string_view)> visitor) const Utf8Stream::UnicodeChar character, std::function<void(std::string_view)> visitor) const = 0;
= 0;
/// walks over the topic entries for the topic specified by its identifier /// walks over the topic entries for the topic specified by its identifier
virtual void visitTopicEntries( virtual void visitTopicEntries(
const MWDialogue::Topic& topic, std::function<void(TopicEntry const&)> visitor) const const MWDialogue::Topic& topic, std::function<void(TopicEntry const&)> visitor) const = 0;
= 0;
// create an instance of the default journal view model implementation // create an instance of the default journal view model implementation
static std::shared_ptr<JournalViewModel> create(); static std::shared_ptr<JournalViewModel> create();

2
components/sceneutil/keyframe.hpp
View file

@ -33,7 +33,7 @@ namespace SceneUtil
virtual osg::Vec3f getTranslation(float time) const { return osg::Vec3f(); } virtual osg::Vec3f getTranslation(float time) const { return osg::Vec3f(); }
virtual KfTransform getCurrentTransformation(osg::NodeVisitor* nv) { return KfTransform(); }; virtual KfTransform getCurrentTransformation(osg::NodeVisitor* nv) { return KfTransform(); }
/// @note We could drop this function in favour of osg::Object::asCallback from OSG 3.6 on. /// @note We could drop this function in favour of osg::Object::asCallback from OSG 3.6 on.
virtual osg::Callback* getAsCallback() = 0; virtual osg::Callback* getAsCallback() = 0;