From 4474ce24c13e87816dede07c647d0d444fa5949f Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Mon, 13 Aug 2018 01:19:07 -0700 Subject: [PATCH] Skipping tests and non Windows builds. Finding and removing previous installations with installer --- .gitlab-ci.yml | 38 +++---- zcutil/VerusCoin.xml | 243 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 261 insertions(+), 20 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 871e94fa4..d8e1f22d5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ variables: EASYDEX_GUI_ARTIFACT: build.tar.gz WINDOWS_INSTALLER: VerusCoin-v$VERSION-beta-windows-installer.exe -build:linux: +.build:linux: image: asherd/veruscoin-cross-compiler:linux variables: DOCKER_DRIVER: overlay2 @@ -79,7 +79,7 @@ build:windows: expire_in: 1 week -build:mac: +.build:mac: stage: build tags: ["High Sierra"] cache: @@ -100,7 +100,7 @@ build:mac: expire_in: 1 week -code_quality: +.code_quality: image: docker:stable variables: DOCKER_DRIVER: overlay2 @@ -118,7 +118,7 @@ code_quality: paths: [gl-code-quality-report.json] -sast: +.sast: image: docker:stable variables: DOCKER_DRIVER: overlay2 @@ -137,7 +137,7 @@ sast: -license_management: +.license_management: image: docker:stable variables: DOCKER_DRIVER: overlay2 @@ -153,7 +153,7 @@ license_management: paths: [gl-license-management-report.json] -ubuntu:xenial: +.ubuntu:xenial: image: ubuntu:xenial variables: DOCKER_DRIVER: overlay2 @@ -171,7 +171,7 @@ ubuntu:xenial: - build:linux -ubuntu:bionic: +.ubuntu:bionic: image: ubuntu:bionic variables: DOCKER_DRIVER: overlay2 @@ -217,7 +217,7 @@ ubuntu:bionic: - build:mac -windows:10: +.windows:10: stage: test tags: ["Windows 10"] script: @@ -260,19 +260,19 @@ deploy: variables: DOCKER_DRIVER: overlay2 dependencies: - - build:linux - - build:windows - - build:mac + #- build:linux + #- build:windows + #- build:mac - package script: - - mkdir -p $CI_COMMIT_REF_NAME/Windows - - mkdir -p $CI_COMMIT_REF_NAME/Linux - - mkdir -p $CI_COMMIT_REF_NAME/MacOS - - mv $VERUS_CLI_WINDOWS_PORTABLE $AGAMA_ARTIFACTS_WINDOWS $WINDOWS_INSTALLER $CI_COMMIT_REF_NAME/Windows - - mv $VERUS_CLI_LINUX_PORTABLE $AGAMA_ARTIFACTS_LINUX $CI_COMMIT_REF_NAME/Linux - - mv $VERUS_CLI_MACOS_PORTABLE $AGAMA_ARTIFACTS_MACOS $CI_COMMIT_REF_NAME/MacOS + #- mkdir -p $CI_COMMIT_REF_NAME/Windows + #- mkdir -p $CI_COMMIT_REF_NAME/Linux + #- mkdir -p $CI_COMMIT_REF_NAME/MacOS + #- mv $VERUS_CLI_WINDOWS_PORTABLE $AGAMA_ARTIFACTS_WINDOWS $WINDOWS_INSTALLER $CI_COMMIT_REF_NAME/Windows + #- mv $VERUS_CLI_LINUX_PORTABLE $AGAMA_ARTIFACTS_LINUX $CI_COMMIT_REF_NAME/Linux + #- mv $VERUS_CLI_MACOS_PORTABLE $AGAMA_ARTIFACTS_MACOS $CI_COMMIT_REF_NAME/MacOS - echo "$AUTH_KEY" > AUTH_KEY.json - gcloud auth activate-service-account --key-file AUTH_KEY.json - - gsutil rsync -r $CI_COMMIT_REF_NAME/ $STAGING/VerusCoin/$CI_COMMIT_REF_NAME/ - + #- gsutil rsync -r $CI_COMMIT_REF_NAME/ $STAGING/VerusCoin/$CI_COMMIT_REF_NAME/ + - gsutil cp $WINDOWS_INSTALLER $CI_COMMIT_REF_NAME/ $STAGING/VerusCoin/$CI_COMMIT_REF_NAME/Windows/ diff --git a/zcutil/VerusCoin.xml b/zcutil/VerusCoin.xml index 17b3ae365..a49a4a6b4 100644 --- a/zcutil/VerusCoin.xml +++ b/zcutil/VerusCoin.xml @@ -106,13 +106,254 @@ + + + ${uninstaller_path} + + + + equals + ${previous_installation_exists} + 1 + + + + + Deleting user data + ${windows_folder_appdata}/Agama + Deleting user data + + + equals + ${previous_installation_exists} + 1 + + + equals + ${installation_type} + uninstall + + + equals + ${delete_user_data} + 1 + + + + + Deleting iguana config json + ${windows_folder_appdata}/Iguana/config.json + Deleting iguana config + + + equals + ${previous_installation_exists} + 1 + + + equals + ${installation_type} + uninstall + + + equals + ${delete_config_data} + 1 + + + + + Uninstalled + Uninstalled + + + equals + ${previous_installation_exists} + 1 + + + equals + ${installation_type} + uninstall + + + + + Downloading files + + + 0 + Visual C++ Redistributable for Visual Studio 2015 library files are needed for Agama daemon + ${system_temp_directory}/vc_redist.x64.exe + Downloading Visual C++ Redistributable for Visual Studio 2015 + 0 + https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe + + + + + 1 + ${system_temp_directory}/vc_redist.x64.exe + + + + + 0 + Visual C++ Redistributable for Visual Studio 2015 library files are needed for Agama daemon + ${system_temp_directory}/vc_redist.x64.exe + /install /passive + Downloading Visual C++ Redistributable for Visual Studio 2015 + 0 + + + Downloading files + + + 0 + Visual C++ Redistributable for Visual Studio 2015 library files are needed for Agama daemon + ${system_temp_directory}/vc_redist.x86.exe + Downloading Visual C++ Redistributable for Visual Studio 2015 + 0 + https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe + + + + + 1 + ${system_temp_directory}/vc_redist.x86.exe + + + + + 0 + Visual C++ Redistributable for Visual Studio 2015 library files are needed for Agama daemon + ${system_temp_directory}/vc_redist.x86.exe + /install /passive + Downloading Visual C++ Redistributable for Visual Studio 2015 + 0 + + + 0 + Creating ZcashParam directory + ${windows_folder_appdata}/ZcashParams/ + Creating ZcashParam directory + 0 + + + 0 + Zcash Params file: sprout-proving.key + Zcash Params file: sprout-proving.key + 0 + Downloading Zcash Params file + + + 0 + Zcash Params file: sprout-proving.key + ${windows_folder_appdata}/ZcashParams/sprout-proving.key + Zcash Params file: sprout-proving.key + 0 + https://z.cash/downloads/sprout-proving.key + + + + + 1 + ${windows_folder_appdata}/ZcashParams/sprout-proving.key + + + + + 0 + Zcash Params file: sprout-verifying.key + Zcash Params file: sprout-verifying.key + Downloading Zcash Params files + + + 0 + Zcash Params file: sprout-verifying.key + ${windows_folder_appdata}/ZcashParams/sprout-verifying.key + Zcash Params file: sprout-verifying.key + 0 + https://z.cash/downloads/sprout-verifying.key + + + + + 1 + ${windows_folder_appdata}/ZcashParams/sprout-verifying.key + + + + - KOMODO_HOME + VERUS_HOME system ${installdir}/verus-cli/ + + HKEY_LOCAL_MACHINE\SOFTWARE\${project.shortname} + uninstaller_path + REG_SZ + ${installdir}/${uninstallerName}.exe + + + + + C:\Windows\System32\ + Copying ReqCopying Required DLL filesuired DLL files + ${installdir}/resources/app/windeps/x86/ucrtbased.dll + Copying ReqCopying Required DLL filesuired DLL files + + + C:\Windows\System32\ + Copying ReqCopying Required DLL filesuired DLL files + ${installdir}/resources/app/windeps/x86/vcruntime140d.dll + Copying ReqCopying Required DLL filesuired DLL files + + + + + + + + + + C:\Windows\System32\ + Copying ReqCopying Required DLL filesuired DLL files + ${installdir}/resources/app/windeps/x64/ucrtbased.dll + Copying ReqCopying Required DLL filesuired DLL files + + + C:\Windows\System32\ + Copying ReqCopying Required DLL filesuired DLL files + ${installdir}/resources/app/windeps/x64/vcruntime140d.dll + Copying ReqCopying Required DLL filesuired DLL files + + + C:\Windows\SysWOW64\ + Copying ReqCopying Required DLL filesuired DLL files + ${installdir}/resources/app/windeps/x86/ucrtbased.dll + Copying ReqCopying Required DLL filesuired DLL files + + + C:\Windows\SysWOW64\ + Copying ReqCopying Required DLL filesuired DLL files + ${installdir}/resources/app/windeps/x86/vcruntime140d.dll + Copying ReqCopying Required DLL filesuired DLL files + + + + + + + + + HKEY_LOCAL_MACHINE\SOFTWARE\${project.shortname} + uninstaller_path + + 1 1 1