Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2025-01-20 23:39:51 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert steps to sign the installer in an attempt to fix the build. Fixed unit tests.

Browse Source 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
This commit is contained in:
Konstantina Chremmou 2020-01-22 23:52:14 +00:00
parent f7391e991b
commit b16eaaae4e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XenAdminTests/CodeTests/AssemblyTests.cs
View File

@ -51,7 +51,7 @@ namespace XenAdminTests.CodeTests
var assembly = FindAssemblyByNameRecursively(assemblyName);
Assert.NotNull($"Assembly {assemblyName} was not found.");
var excludeFromCheck = new[] {"XenAdmin.Help.HelpManager"};
var excludeFromCheck = new[] {"XenAdmin.Help.HelpManager", "XenAdmin.Branding"};
var missing = new List<string>();
var extra = new List<string>();

5
mk/xenadmin-build.sh
View File

@ -186,14 +186,15 @@ for locale in ja-jp zh-cn zh-tw ; do
done
#copy and sign the combined installer
chmod a+rw ${WIX}/${BRANDING_BRAND_CONSOLE}.msi && cp ${WIX}/${BRANDING_BRAND_CONSOLE}.msi ${OUTPUT_DIR}
if [ -z "$2" ] || [ -z "$3" ] || [ -z "$4" ] || [ -z "$5" ] || [ -z "$6" ] ; then
echo "Some signing parameters are not set; skip signing installer"
else
${SIGN_BAT} ${OUTPUT_DIR}/${BRANDING_BRAND_CONSOLE}.msi "${SIGN_DESCR}"
cd ${WIX} && chmod a+rw ${BRANDING_BRAND_CONSOLE}.msi && ${SIGN_BAT} ${BRANDING_BRAND_CONSOLE}.msi "${SIGN_DESCR}"
fi
cp ${WIX}/${BRANDING_BRAND_CONSOLE}.msi ${OUTPUT_DIR}
#build the tests
echo "INFO: Build the tests..."
cd ${REPO}/XenAdminTests && "${MSBUILD}" ${SWITCHES}