From ee269dcaaab89744881be2e7f6ce12ac58095b28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Mat=C3=ADas?= <41979395+FEDERICOMB96@users.noreply.github.com> Date: Tue, 23 Jul 2024 02:56:04 -0300 Subject: [PATCH] test fix 10 --- .github/workflows/build.yml | 1 + version/appversion.sh | 52 ++++++++++++++++++------------------- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8fc515c..f41c71c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,6 +66,7 @@ jobs: REAPI_INCLUDE: ${{ env.REAPI_INCLUDE_PATH }} run: | cat ${GITHUB_WORKSPACE}/addons/amxmodx/scripting/include/mm_incs/version.inc + cat ${GITHUB_WORKSPACE}/addons/amxmodx/scripting/include/multimod_manager_version.inc mkdir ../plugins/ for sourcefile in *.sma; do diff --git a/version/appversion.sh b/version/appversion.sh index 2ef4a64..ee6dba6 100644 --- a/version/appversion.sh +++ b/version/appversion.sh @@ -46,35 +46,35 @@ update_appversion() { echo Updating $APPVERSION_FILE, new version is '"'$NEW_VERSION'"' - echo -e "#if defined _mm_version_included_\r" > $APPVERSION_FILE - echo -e " #endinput\r" >> $APPVERSION_FILE - echo -e "#endif\r" >> $APPVERSION_FILE - echo -e "#define _mm_version_included_\r" >> $APPVERSION_FILE - echo -e "\r" >> $APPVERSION_FILE - echo -e "// MultiMod Manager version\r" >> $APPVERSION_FILE - echo -e "#define MM_VERSION $NEW_VERSION_INC\r" >> $APPVERSION_FILE - echo -e "#define MM_VERSION_MAJOR $MAJOR\r" >> $APPVERSION_FILE - echo -e "#define MM_VERSION_MINOR $MINOR\r" >> $APPVERSION_FILE - echo -e "#define MM_VERSION_MAINTENANCE $MAINTENANCE\r" >> $APPVERSION_FILE - echo -e "#define MM_VERSION_COMMIT $COMMIT_COUNT\r" >> $APPVERSION_FILE - echo -e "\r" >> $APPVERSION_FILE - echo -e "#define PLUGIN_VERSION fmt("v%d.%d.%d.%d", MM_VERSION_MAJOR, MM_VERSION_MINOR, MM_VERSION_MAINTENANCE, MM_VERSION_COMMIT)" >> $APPVERSION_FILE + echo -e "#if defined _mm_version_included_\r">$APPVERSION_FILE + echo -e " #endinput\r">>$APPVERSION_FILE + echo -e "#endif\r">>$APPVERSION_FILE + echo -e "#define _mm_version_included_\r">>$APPVERSION_FILE + echo -e "\r">>$APPVERSION_FILE + echo -e "// MultiMod Manager version\r">>$APPVERSION_FILE + echo -e "#define MM_VERSION $NEW_VERSION_INC\r">>$APPVERSION_FILE + echo -e "#define MM_VERSION_MAJOR $MAJOR\r">>$APPVERSION_FILE + echo -e "#define MM_VERSION_MINOR $MINOR\r">>$APPVERSION_FILE + echo -e "#define MM_VERSION_MAINTENANCE $MAINTENANCE\r">>$APPVERSION_FILE + echo -e "#define MM_VERSION_COMMIT $COMMIT_COUNT\r">>$APPVERSION_FILE + echo -e "\r">>$APPVERSION_FILE + echo -e "#define PLUGIN_VERSION fmt("v%d.%d.%d.%d", MM_VERSION_MAJOR, MM_VERSION_MINOR, MM_VERSION_MAINTENANCE, MM_VERSION_COMMIT)\r">>$APPVERSION_FILE echo Updating $APPVERSION_FILE_NATIVES, new version is '"'$NEW_VERSION'"' - echo -e "#if defined _multimod_manager_version_included_\r" > $APPVERSION_FILE_NATIVES - echo -e " #endinput\r" >> $APPVERSION_FILE_NATIVES - echo -e "#endif\r" >> $APPVERSION_FILE_NATIVES - echo -e "#define _multimod_manager_version_included_\r" >> $APPVERSION_FILE_NATIVES - echo -e "\r" >> $APPVERSION_FILE_NATIVES - echo -e "// MultiMod Manager version\r" >> $APPVERSION_FILE_NATIVES - echo -e "#define MM_VERSION $NEW_VERSION_INC\r" >> $APPVERSION_FILE_NATIVES - echo -e "#define MM_VERSION_MAJOR $MAJOR\r" >> $APPVERSION_FILE_NATIVES - echo -e "#define MM_VERSION_MINOR $MINOR\r" >> $APPVERSION_FILE_NATIVES - echo -e "#define MM_VERSION_MAINTENANCE $MAINTENANCE\r" >> $APPVERSION_FILE_NATIVES - echo -e "#define MM_VERSION_COMMIT $COMMIT_COUNT\r" >> $APPVERSION_FILE_NATIVES - echo -e "\r" >> $APPVERSION_FILE_NATIVES - echo -e "#define MM_NATIVES_API_VER fmt("v%d.%d.%d.%d", MM_VERSION_MAJOR, MM_VERSION_MINOR, MM_VERSION_MAINTENANCE, MM_VERSION_COMMIT)" >> $APPVERSION_FILE_NATIVES + echo -e "#if defined _multimod_manager_version_included_\r">$APPVERSION_FILE_NATIVES + echo -e " #endinput\r">>$APPVERSION_FILE_NATIVES + echo -e "#endif\r">>$APPVERSION_FILE_NATIVES + echo -e "#define _multimod_manager_version_included_\r">>$APPVERSION_FILE_NATIVES + echo -e "\r">>$APPVERSION_FILE_NATIVES + echo -e "// MultiMod Manager version\r">>$APPVERSION_FILE_NATIVES + echo -e "#define MM_VERSION $NEW_VERSION_INC\r">>$APPVERSION_FILE_NATIVES + echo -e "#define MM_VERSION_MAJOR $MAJOR\r">>$APPVERSION_FILE_NATIVES + echo -e "#define MM_VERSION_MINOR $MINOR\r">>$APPVERSION_FILE_NATIVES + echo -e "#define MM_VERSION_MAINTENANCE $MAINTENANCE\r">>$APPVERSION_FILE_NATIVES + echo -e "#define MM_VERSION_COMMIT $COMMIT_COUNT\r">>$APPVERSION_FILE_NATIVES + echo -e "\r">>$APPVERSION_FILE_NATIVES + echo -e "#define MM_NATIVES_API_VER fmt("v%d.%d.%d.%d", MM_VERSION_MAJOR, MM_VERSION_MINOR, MM_VERSION_MAINTENANCE, MM_VERSION_COMMIT)\r">>$APPVERSION_FILE_NATIVES } # Initialise