2
0
Эх сурвалжийг харах

Fix ENABLE_GOLDMASTER usage

Ivan Savenko 1 жил өмнө
parent
commit
99281cf987

+ 2 - 2
CI/get_package_name.sh

@@ -27,7 +27,7 @@ fi
 
 VCMI_PACKAGE_FILE_NAME="${TMP_JOBID}-vcmi"
 VCMI_PACKAGE_NAME_SUFFIX=""
-VCMI_PACKAGE_GOLDMASTER="ON"
+VCMI_PACKAGE_GOLDMASTER="OFF"
 if [ -z "$TMP_PRID" ] || [ "$TMP_PRID" == "false" ];
 then
 	branch_name=$(echo "$TMP_BRANCH" | sed 's/[^[:alnum:]]\+/_/g')
@@ -36,7 +36,7 @@ then
 	then
 		VCMI_PACKAGE_NAME_SUFFIX="branch ${branch_name}"
 	else
-		VCMI_PACKAGE_GOLDMASTER="OFF"
+		VCMI_PACKAGE_GOLDMASTER="ON"
 	fi
 else
 	VCMI_PACKAGE_FILE_NAME="${VCMI_PACKAGE_FILE_NAME}-PR-${TMP_PRID}-${TMP_COMMIT}"

+ 1 - 1
debian/rules

@@ -9,7 +9,7 @@ override_dh_auto_configure:
 		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON \
 		-DCMAKE_INSTALL_RPATH=/usr/lib/$(DEB_HOST_MULTIARCH)/vcmi \
 		-DCMAKE_BUILD_TYPE=Release \
-		-DENABLE_GITVERSION=OFF \
+		-DENABLE_GOLDMASTER=ON \
 		-DBIN_DIR=games \
 		-DFORCE_BUNDLED_FL=OFF \
 		-DENABLE_TEST=0