From 9dd2395d68c2284d47472c57a7eeddf6f59a7d2c Mon Sep 17 00:00:00 2001 From: bones_was_here Date: Sun, 19 Jun 2022 00:43:18 +1000 Subject: [PATCH] Change gameversion_min logic per xonotic-data.pk3dir!1034 and update xonotic-release-build.cron again --- misc/infrastructure/xonotic-release-build.cron | 2 +- misc/tools/all/release.subr | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/misc/infrastructure/xonotic-release-build.cron b/misc/infrastructure/xonotic-release-build.cron index 5a5fd72c..479746ac 100755 --- a/misc/infrastructure/xonotic-release-build.cron +++ b/misc/infrastructure/xonotic-release-build.cron @@ -39,7 +39,7 @@ fi set -ex -test "$RELEASETYPE" = "autobuild" && ssh autobuild-release-uploader@beta.xonotic.org ' +test -z "$RELEASETYPEDIR" && ssh autobuild-release-uploader@beta.xonotic.org ' set -e; s0=`date -d "now - 7 days - 12 hours" +%s`; s00=`date -d "now - 60 days - 12 hours" +%s`; diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr index be9320d4..99ab7884 100644 --- a/misc/tools/all/release.subr +++ b/misc/tools/all/release.subr @@ -461,16 +461,18 @@ case "$cmd" in # pre-1.0: compatible with any other pre-1.0 verbose sed " s/^set g_xonoticversion [^ ]* /set g_xonoticversion $versionstr /; - s/^gameversion_min [0-9]*/gameversion_min 0/; s/^gameversion_max [0-9]*/gameversion_max 9999/; " < xonotic-common.cfg > xonotic-common.cfg.new + # Following line was included in sed above, ref https://gitlab.com/xonotic/xonotic-data.pk3dir/-/merge_requests/1034 + # s/^gameversion_min [0-9]*/gameversion_min 0/; else # >= 1.0 verbose sed " s/^set g_xonoticversion [^ ]* /set g_xonoticversion $versionstr /; - s/^gameversion_min [0-9]*/gameversion_min $(( ($gv / 100) * 100 - 100 ))/; s/^gameversion_max [0-9]*/gameversion_max $(( ($gv / 100) * 100 + 199 ))/; " < xonotic-common.cfg > xonotic-common.cfg.new + # Following line was included in sed above, ref https://gitlab.com/xonotic/xonotic-data.pk3dir/-/merge_requests/1034 + # s/^gameversion_min [0-9]*/gameversion_min $(( ($gv / 100) * 100 - 100 ))/; fi mv xonotic-common.cfg.new xonotic-common.cfg case "$RELEASETYPE" in -- 2.39.2