diff --git a/appveyor.yml b/appveyor.yml index 69bdbc402bb9a4dd0c2abf0264a50bb78fdb6aaf..f15e3e003e37d8e364225e18860af1365e87831f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,64 +17,64 @@ install: build: off after_test: - - npm prune --production - - npm install duniter-bma --save --production - - npm install duniter-crawler --save --production - - npm install duniter-keypair --save --production - - npm install duniter-prover --save --production - - powershell .\\ci\\appveyor\\inno_setup.ps1 - - rd /s /q %APPDATA%\..\Local\NuGet\Cache - - set PATH="C:\Program Files (x86)\Inno Setup 5";%PATH% - - set SRC=%cd% - - echo %SRC% - - copy misc\MSVSVersion.py %APPDATA%\npm\node_modules\nw-gyp\gyp\pylib\gyp\MSVSVersion.py - - set NW_VERSION=0.17.6 - - set NW_RELEASE=v0.17.6 - - echo %NW_RELEASE% - - cd node_modules/wotb - - npm install --build-from-source - - node-pre-gyp --runtime=node-webkit --target=%NW_VERSION% --msvs_version=2015 configure - - node-pre-gyp --runtime=node-webkit --target=%NW_VERSION% --msvs_version=2015 build - - copy %cd%\lib\binding\Release\node-webkit-%NW_RELEASE%-win32-x64\wotb.node %cd%\lib\binding\Release\node-v%ADDON_VERSION%-win32-x64\wotb.node /Y - - cd ../naclb - - npm install --build-from-source - - node-pre-gyp --runtime=node-webkit --target=%NW_VERSION% --msvs_version=2015 configure - - node-pre-gyp --runtime=node-webkit --target=%NW_VERSION% --msvs_version=2015 build - - copy %cd%\lib\binding\Release\node-webkit-%NW_RELEASE%-win32-x64\naclb.node %cd%\lib\binding\Release\node-v%ADDON_VERSION%-win32-x64\naclb.node /Y - - cd ../scryptb - - npm install --build-from-source - - node-pre-gyp --runtime=node-webkit --target=%NW_VERSION% --msvs_version=2015 configure - - node-pre-gyp --runtime=node-webkit --target=%NW_VERSION% --msvs_version=2015 build - - copy %cd%\lib\binding\Release\node-webkit-%NW_RELEASE%-win32-x64\scryptb.node %cd%\lib\binding\Release\node-v%ADDON_VERSION%-win32-x64\scryptb.node /Y - - cd ../sqlite3 - - npm install --build-from-source - - node-pre-gyp --runtime=node-webkit --target=%NW_VERSION% --msvs_version=2015 configure - - node-pre-gyp --runtime=node-webkit --target=%NW_VERSION% --msvs_version=2015 build - - copy %cd%\lib\binding\node-webkit-%NW_RELEASE%-win32-x64\node_sqlite3.node %cd%\lib\binding\node-v%ADDON_VERSION%-win32-x64\node_sqlite3.node /Y - - cd ../.. - - npm install duniter-ui --save --production - - rd /s /q %cd%\node_modules\duniter-ui\node_modules - - cd .. - - mkdir duniter_release - - set NW=nwjs-%NW_RELEASE%-win-x64 - - echo %NW% - - set NW_GZ=%NW%.zip - - echo %NW_GZ% - - appveyor DownloadFile https://dl.nwjs.io/%NW_RELEASE%/nwjs-%NW_RELEASE%-win-x64.zip %NW_GZ% - - 7z x %NW_GZ% 1> null - - move %NW% %cd%\duniter_release\nw - - mkdir %cd%\duniter_release\sources - - xcopy %SRC%\gui\* %cd%\duniter_release\nw\ /s /e - - xcopy %SRC%\* %cd%\duniter_release\sources\ /s /e - - iscc %cd%\duniter_release\sources\duniter.iss /DROOT_PATH=%cd%\duniter_release - - move %cd%\duniter_release\Duniter.exe %cd%\duniter\duniter-desktop-%APPVEYOR_REPO_TAG_NAME%-windows-x64.exe + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] npm prune --production + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] npm install duniter-bma --save --production + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] npm install duniter-crawler --save --production + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] npm install duniter-keypair --save --production + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] npm install duniter-prover --save --production + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] powershell .\\ci\\appveyor\\inno_setup.ps1 + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] rd /s /q %APPDATA%\..\Local\NuGet\Cache + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] set PATH="C:\Program Files (x86)\Inno Setup 5";%PATH% + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] set SRC=%cd% + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] echo %SRC% + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] copy misc\MSVSVersion.py %APPDATA%\npm\node_modules\nw-gyp\gyp\pylib\gyp\MSVSVersion.py + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] set NW_VERSION=0.17.6 + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] set NW_RELEASE=v0.17.6 + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] echo %NW_RELEASE% + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] cd node_modules/wotb + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] npm install --build-from-source + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] node-pre-gyp --runtime=node-webkit --target=%NW_VERSION% --msvs_version=2015 configure + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] node-pre-gyp --runtime=node-webkit --target=%NW_VERSION% --msvs_version=2015 build + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] copy %cd%\lib\binding\Release\node-webkit-%NW_RELEASE%-win32-x64\wotb.node %cd%\lib\binding\Release\node-v%ADDON_VERSION%-win32-x64\wotb.node /Y + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] cd ../naclb + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] npm install --build-from-source + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] node-pre-gyp --runtime=node-webkit --target=%NW_VERSION% --msvs_version=2015 configure + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] node-pre-gyp --runtime=node-webkit --target=%NW_VERSION% --msvs_version=2015 build + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] copy %cd%\lib\binding\Release\node-webkit-%NW_RELEASE%-win32-x64\naclb.node %cd%\lib\binding\Release\node-v%ADDON_VERSION%-win32-x64\naclb.node /Y + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] cd ../scryptb + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] npm install --build-from-source + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] node-pre-gyp --runtime=node-webkit --target=%NW_VERSION% --msvs_version=2015 configure + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] node-pre-gyp --runtime=node-webkit --target=%NW_VERSION% --msvs_version=2015 build + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] copy %cd%\lib\binding\Release\node-webkit-%NW_RELEASE%-win32-x64\scryptb.node %cd%\lib\binding\Release\node-v%ADDON_VERSION%-win32-x64\scryptb.node /Y + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] cd ../sqlite3 + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] npm install --build-from-source + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] node-pre-gyp --runtime=node-webkit --target=%NW_VERSION% --msvs_version=2015 configure + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] node-pre-gyp --runtime=node-webkit --target=%NW_VERSION% --msvs_version=2015 build + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] copy %cd%\lib\binding\node-webkit-%NW_RELEASE%-win32-x64\node_sqlite3.node %cd%\lib\binding\node-v%ADDON_VERSION%-win32-x64\node_sqlite3.node /Y + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] cd ../.. + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] npm install duniter-ui --save --production + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] rd /s /q %cd%\node_modules\duniter-ui\node_modules + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] cd .. + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] mkdir duniter_release + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] set NW=nwjs-%NW_RELEASE%-win-x64 + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] echo %NW% + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] set NW_GZ=%NW%.zip + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] echo %NW_GZ% + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] appveyor DownloadFile https://dl.nwjs.io/%NW_RELEASE%/nwjs-%NW_RELEASE%-win-x64.zip %NW_GZ% + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] 7z x %NW_GZ% 1> null + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] move %NW% %cd%\duniter_release\nw + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] mkdir %cd%\duniter_release\sources + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] xcopy %SRC%\gui\* %cd%\duniter_release\nw\ /s /e + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] xcopy %SRC%\* %cd%\duniter_release\sources\ /s /e + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] iscc %cd%\duniter_release\sources\duniter.iss /DROOT_PATH=%cd%\duniter_release + - if [%APPVEYOR_REPO_TAG_NAME%] neq [] move %cd%\duniter_release\Duniter.exe %cd%\duniter\duniter-desktop-%APPVEYOR_REPO_TAG_NAME%-windows-x64.exe artifacts: - path: duniter*.exe name: Duniter deploy: - release: v1.2.1 + release: v1.2.2 provider: GitHub auth_token: secure: Vp/M0r0i1yhGR2nhrPWEbTiDIF6r0cmwbNDFZUzdFe5clWxPXtuC0lgIpOQI78zt diff --git a/ci/travis/before_deploy.sh b/ci/travis/before_deploy.sh index 39696fe1f8feff7b912c9bf4e2cdc73249eb1914..d7c7841703740b9d2a330c2b61d5d33a8d6c6c30 100755 --- a/ci/travis/before_deploy.sh +++ b/ci/travis/before_deploy.sh @@ -7,7 +7,7 @@ if [[ ! -f before_deploy ]]; then # Prepare NVER=`node -v` - DUNITER_VER=1.2.1 + DUNITER_VER=1.2.2 DUNITER_DEB_VER=" $DUNITER_VER" ADDON_VERSION=48 NW_VERSION=0.17.6 diff --git a/ci/travis/debian/DEBIAN/control b/ci/travis/debian/DEBIAN/control index 565a25cf5ad30eefc7f85cf56944e58385f95c7c..36f586f3fae4a3dc71f075e7bb4897b8315a8d82 100644 --- a/ci/travis/debian/DEBIAN/control +++ b/ci/travis/debian/DEBIAN/control @@ -1,5 +1,5 @@ Package: duniter -Version: 1.2.1 +Version: 1.2.2 Section: misc Priority: optional Architecture: all diff --git a/gui/index.html b/gui/index.html index 2c476a7e3f4325a6447040fd0147a93f2aeca13e..958cc1c967e891e035c8478ece6ee2300ec82888 100644 --- a/gui/index.html +++ b/gui/index.html @@ -3,7 +3,7 @@ <head> <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <title>Duniter 1.2.1</title> + <title>Duniter 1.2.2</title> <style> html { font-family: "Courier New", Courier, monospace; diff --git a/gui/package.json b/gui/package.json index dec1a9874279fe7d4d34d9bc7e4ea8fabcf26b0d..06b5f4ad2716e2ec8a83f51f2ba456e5ffd7a25d 100644 --- a/gui/package.json +++ b/gui/package.json @@ -1,10 +1,10 @@ { - "name": "v1.2.1", + "name": "v1.2.2", "main": "index.html", "node-main": "../sources/bin/duniter", "window": { "icon": "duniter.png", - "title": "v1.2.1", + "title": "v1.2.2", "width": 800, "height": 800, "min_width": 750, diff --git a/install.sh b/install.sh index fe894ef92545ff27c75c159c5e8c8151d56b2783..21ca7a5387c761d71fbdafec93331e230f3ddc6c 100755 --- a/install.sh +++ b/install.sh @@ -11,7 +11,7 @@ if [ -z "$DUNITER_DIR" ]; then fi latest_version() { - echo "v1.2.1" + echo "v1.2.2" } repo_url() { diff --git a/package.json b/package.json index ce90fcc11625531db82cbac61e0b0a87a7c22250..f0c87fddb2b84a30885b00810a647f0ea22731bc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "duniter", - "version": "1.2.1", + "version": "1.2.2", "engines": { "node": ">=4.2.0", "npm": ">=2.11" diff --git a/test/integration/branches.js b/test/integration/branches.js index c8ed341f8ea18e3997636b0602ae1491dc7cd779..46fd589a1064c587fe4bed234ac1943cb4225f9b 100644 --- a/test/integration/branches.js +++ b/test/integration/branches.js @@ -43,7 +43,7 @@ describe("Branches", () => co(function*() { it('should have a 3 blocks fork window size', function() { return expectAnswer(rp('http://127.0.0.1:7778/node/summary', { json: true }), function(res) { res.should.have.property('duniter').property('software').equal('duniter'); - res.should.have.property('duniter').property('version').equal('1.2.1'); + res.should.have.property('duniter').property('version').equal('1.2.2'); res.should.have.property('duniter').property('forkWindowSize').equal(3); }); });