From 99281cf987733420ca914ae98dce5c272b3f1918 Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Thu, 25 Apr 2024 19:18:36 +0300 Subject: [PATCH] Fix ENABLE_GOLDMASTER usage --- CI/get_package_name.sh | 4 ++-- debian/rules | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CI/get_package_name.sh b/CI/get_package_name.sh index 4f8504c4b..2bae1794e 100644 --- a/CI/get_package_name.sh +++ b/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}" diff --git a/debian/rules b/debian/rules index a0f3fb95d..7051f2b20 100755 --- a/debian/rules +++ b/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