From 93de411d2f79cc3032f3f54a487b21850c0221b4 Mon Sep 17 00:00:00 2001 From: Steve Cotton Date: Sun, 21 Feb 2021 16:38:34 +0100 Subject: [PATCH] Fixup WC2 validation (combination of 41b2b0b with e47b759) The combination of disabling and validating WC2 meant that the build failed, so add another #def that will enable it for validation. --- data/campaigns/World_Conquest/_main.cfg | 4 +++- utils/CI/schema_validation.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/data/campaigns/World_Conquest/_main.cfg b/data/campaigns/World_Conquest/_main.cfg index b41b6ba8cd4a..442f0bcbd111 100644 --- a/data/campaigns/World_Conquest/_main.cfg +++ b/data/campaigns/World_Conquest/_main.cfg @@ -5,7 +5,9 @@ name="wesnoth-wc" [/textdomain] -# {./config.cfg} +#ifdef LOAD_WC2_EVEN_THOUGH_IT_NEEDS_A_NEW_MAINTAINER +{./config.cfg} +#endif #ifdef LOAD_WC2 diff --git a/utils/CI/schema_validation.sh b/utils/CI/schema_validation.sh index c499998bc76c..412589532963 100755 --- a/utils/CI/schema_validation.sh +++ b/utils/CI/schema_validation.sh @@ -110,7 +110,7 @@ validate_core "Core" || RET=1 validate_misc "Editor" "EDITOR" || RET=1 validate_misc "Multiplayer" "MULTIPLAYER,MULTIPLAYER_A_NEW_LAND_LOAD" || RET=1 validate_misc "Test" "TEST,SCHEMA_SHOULD_SKIP_THIS" || RET=1 -validate_misc "World_Conquest" "MULTIPLAYER,LOAD_WC2" || RET=1 +validate_misc "World_Conquest" "MULTIPLAYER,LOAD_WC2,LOAD_WC2_EVEN_THOUGH_IT_NEEDS_A_NEW_MAINTAINER" || RET=1 validate_campaign "Dead_Water" "CAMPAIGN_DEAD_WATER" "EASY" "NORMAL" "HARD" "NIGHTMARE" || RET=1 validate_campaign "Delfadors_Memoirs" "CAMPAIGN_DELFADORS_MEMOIRS" "EASY" "NORMAL" "HARD" || RET=1 validate_campaign "Descent_Into_Darkness" "CAMPAIGN_DESCENT" "EASY" "NORMAL" "HARD" || RET=1