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.
wesnoth · Feb 21, 2021 · 93de411 · 93de411
1 parent 0cb0f35
commit 93de411
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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