diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 97e9c1b70..996266e62 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,8 +9,8 @@ variables: DOCKER_DRIVER: overlay2 DEFAULT_VERUSCOIN_BRANCH: ${CI_COMMIT_REF_NAME} DEFAULT_EASYDEXGUI_BRANCH: ${CI_COMMIT_REF_NAME} - AGAMA_VERSION: 0.5.5d - VERUSCOIN_VERSION: 0.5.5c + AGAMA_VERSION: 0.5.6 + VERUSCOIN_VERSION: 0.5.6 KOMODO_VERSION: 0.3.3b-beta BINARY_SOURCE: VerusCoin EASYDEX_GUI_BUILD: build.tar.gz @@ -53,18 +53,17 @@ build:linux: - tar -xzf $EASYDEX_GUI_BUILD --directory gui/EasyDEX-GUI/react && rm ${EASYDEX_GUI_BUILD} - gsutil cp $STAGING/$VERUS_CLI_LINUX . - mkdir -p assets/bin/linux64/verusd + - gsutil cp $STAGING/linux64.tar.gz . + - tar -xzvf linux64.tar.gz --strip=1 --directory assets/bin/linux64 - tar -xzvf Verus-CLI-Linux-v${VERUSCOIN_VERSION}.tar.gz --strip=1 --directory assets/bin/linux64/verusd + - rm Verus-CLI-Linux-v${VERUSCOIN_VERSION}.tar.gz - rm assets/bin/linux64/verusd/verusd - mv assets/bin/linux64/verusd/komodod assets/bin/linux64/verusd/verusd #- wget https://github.com/KomodoPlatform/komodo/releases/download/master-multios-${KOMODO_VERSION}/komodo_linux_${KOMODO_VERSION}.tar.gz - - wget https://github.com/KomodoPlatform/komodo/releases/download/beta-multios-0.3.3b-beta/komodo_linux_beta_0.3.3b.tar.gz -# - tar -xvfz komodo_linux_${KOMODO_VERSION}.tar.gz --strip=1 --directory assets/bin/linux64 - - tar -xzvf komodo_linux_beta_0.3.3b.tar.gz --strip=1 --directory assets/bin/linux64 +# - wget https://github.com/KomodoPlatform/komodo/releases/download/beta-multios-0.3.3b-beta/komodo_linux_beta_0.3.3b.tar.gz - strip -g assets/bin/linux64/komodod && strip -g assets/bin/linux64/komodo-cli - - rm Verus-CLI-Linux-v${VERUSCOIN_VERSION}.tar.gz + - rm linux64.tar.gz # - rm komodo_linux_${KOMODO_VERSION}.tar.gz - - rm komodo_linux_beta_0.3.3b.tar.gz - - rm -rf __MACOSX - npm install script: - npm run package-linux @@ -110,17 +109,15 @@ build:windows: - mv assets/bin/win64/verus-cli assets/bin/win64/verusd - mv assets/bin/win64/verusd/komodod.exe assets/bin/win64/verusd/verusd.exe # - wget https://github.com/KomodoPlatform/komodo/releases/download/master-multios-${KOMODO_VERSION}/komodo_win_${KOMODO_VERSION}.zip - - wget https://github.com/KomodoPlatform/komodo/releases/download/beta-multios-0.3.3b-beta/komodo_windows_beta_0.3.3.zip -# - unzip komodo_win_${KOMODO_VERSION}.zip - - unzip komodo_windows_beta_0.3.3.zip + - gsutil cp $STAGING/win64.zip . + - unzip win64.zip # - mv komodo_win_${KOMODO_VERSION}/* assets/bin/win64 - - mv komodo_windows_beta_0.3.3/* assets/bin/win64 + - mv win64/* assets/bin/win64 + - rm -rf win64 + - rm win64.zip - strip -g assets/bin/win64/komodod.exe && strip -g assets/bin/win64/komodo-cli.exe && strip -g assets/bin/win64/komodo-tx.exe - rm Verus-CLI-Windows-v${VERUSCOIN_VERSION}.zip #- rm komodo_win_${KOMODO_VERSION}.zip - - rm komodo_windows_beta_0.3.3.zip - - rm -rf __MACOSX - - rm -rf komodo_win_${KOMODO_VERSION} - npm install script: - npm run package-win @@ -158,16 +155,17 @@ build:mac: - tar -xzf $EASYDEX_GUI_BUILD --directory gui/EasyDEX-GUI/react && rm $EASYDEX_GUI_BUILD - gsutil cp $STAGING/$VERUS_CLI_MACOS . + - gsutil cp $STAGING/macos.tar.gz . - mkdir -p assets/bin/osx/verusd - tar -xzf Verus-CLI-MacOS-v${VERUSCOIN_VERSION}.tar.gz --strip=1 --directory assets/bin/osx/verusd - mv assets/bin/osx/verusd/komodod assets/bin/osx/verusd/verusd # - wget https://github.com/KomodoPlatform/komodo/releases/download/master-multios-${KOMODO_VERSION}/komodo_osx_${KOMODO_VERSION}.tar.gz - wget https://github.com/KomodoPlatform/komodo/releases/download/beta-multios-0.3.3b-beta/komodo_osx_beta_0.3.3b.tar.gz # - tar -xzvf komodo_osx_${KOMODO_VERSION}.tar.gz --strip=1 --directory assets/bin/osx - - tar -xzvf komodo_osx_beta_0.3.3b.tar.gz --strip=1 --directory assets/bin/osx + - tar -xzvf macos.tar.gz --strip=1 --directory assets/bin/osx - rm Verus-CLI-MacOS-v${VERUSCOIN_VERSION}.tar.gz # - rm komodo_osx_${KOMODO_VERSION}.tar.gz - - rm komodo_osx_beta_0.3.3b.tar.gz + - rm macos.tar.gz - npm install script: - npm run package-mac diff --git a/package.json b/package.json index f7c3b844d..90fa0fc71 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "agama-app", "productName": "Agama", - "version": "0.5.5d", + "version": "0.5.6", "description": "Agama Wallet Desktop App", "main": "main.js", "scripts": { diff --git a/version b/version index 35999b792..b557c940b 100644 --- a/version +++ b/version @@ -1,4 +1,4 @@ -version=0.5.5d -minversion=0.5.5d +version=0.5.6 +minversion=0.5.6 diff --git a/version_build b/version_build index 578cec0fd..cee090e17 100644 --- a/version_build +++ b/version_build @@ -1,3 +1,3 @@ -0.5.5d +0.5.6