Skip to content
Snippets Groups Projects
Commit f2c3955f authored by Cédric Moreau's avatar Cédric Moreau
Browse files

Merge branch '1.2' into dev

parents 94cdc6c6 6c7fd9ec
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
appveyor.yml
+ 52
− 52
View file @ f2c3955f
......@@ -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
......
ci/travis/before_deploy.sh
+ 1
− 1
View file @ f2c3955f
......@@ -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
......
ci/travis/debian/DEBIAN/control
+ 1
− 1
View file @ f2c3955f
Package: duniter
Version: 1.2.1
Version: 1.2.2
Section: misc
Priority: optional
Architecture: all
......
gui/index.html
+ 1
− 1
View file @ f2c3955f
......@@ -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;
......
gui/package.json
+ 2
− 2
View file @ f2c3955f
{
"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,
......
install.sh
+ 1
− 1
View file @ f2c3955f
......@@ -11,7 +11,7 @@ if [ -z "$DUNITER_DIR" ]; then
fi
latest_version() {
echo "v1.2.1"
echo "v1.2.2"
}
repo_url() {
......
package.json
+ 1
− 1
View file @ f2c3955f
{
"name": "duniter",
"version": "1.2.1",
"version": "1.2.2",
"engines": {
"node": ">=4.2.0",
"npm": ">=2.11"
......
test/integration/branches.js
+ 1
− 1
View file @ f2c3955f
......@@ -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);
});
});
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment