diff --git a/.travis.yml b/.travis.yml index 75ef5fe64..c42985c91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,21 @@ language: node_js -dist: trusty +dist: xenial sudo: required +# ######################## +# How to trigger a release +# +# Push a tag to origin: +# - "release" (= patch) +# - "release/patch" +# - "release/minor" +# - "release/major" +# ######################## + stages: - name: test - name: build-test - if: tag =~ /^(?!release\/).*/ + if: tag !~ /^release\/(major|minor|patch)$/ - name: release if: tag =~ /^release\/(major|minor|patch)$/ @@ -59,21 +69,23 @@ jobs: ################################################## - stage: release name: release - node_js: - - "10.15.3" services: - docker script: - npm install -g @dappnode/dappnodesdk - docker-compose build - - dappnodesdk publish patch -p infura - + - "TYPE=${TRAVIS_TAG##*/}" + - "[ ! '$TYPE' = 'release' ] || TYPE='patch'" + - dappnodesdk publish ${TYPE} -p infura + node_js: + - "10.15.3" before_deploy: - wget https://raw.githubusercontent.com/dappnode/DAppNode/master/scripts/before_deploy.sh - source before_deploy.sh deploy: provider: releases prerelease: true + overwrite: true api_key: "$GITHUB_TOKEN" file_glob: true # $RELEASE_VERSION is exported on before_deploy.sh @@ -83,9 +95,8 @@ jobs: name: "$TRAVIS_TAG" body: "# Changelog" on: - branch: master tags: true condition: "$TRAVIS_TAG = release || $TRAVIS_TAG = release/patch || $TRAVIS_TAG = release/minor || $TRAVIS_TAG = release/major" - after_deploy: - # - wget https://raw.githubusercontent.com/dappnode/DAppNode/master/scripts/after_deploy.sh - # - source after_deploy.sh + # after_deploy: + # - wget https://raw.githubusercontent.com/dappnode/DAppNode/master/scripts/after_deploy.sh + # - source after_deploy.sh diff --git a/README.md b/README.md index 35c6239d3..78cfa583a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,11 @@

+[![Website dappnode.io](https://img.shields.io/badge/Website-dappnode.io-brightgreen.svg)](https://dappnode.io/) +[![Documentation Wiki](https://img.shields.io/badge/Documentation-Wiki-brightgreen.svg)](https://docs.dappnode.io) +[![GIVETH Campaign](https://img.shields.io/badge/GIVETH-Campaign-1e083c.svg)](https://donate.dappnode.io) +[![RIOT DAppNode](https://img.shields.io/badge/RIOT-DAppNode-blue.svg)](https://riot.dappnode.io) +[![Twitter Follow](https://img.shields.io/twitter/follow/espadrine.svg?style=social&label=Follow)](https://twitter.dappnode.io) + The **DNP_DAPPMANAGER** handles the DAppNode core DNPs and any installed DNPs. It also performs maintenance checks. - :bust_in_silhouette: For user / usage documentation go to the [user manual](https://dappnode.readthedocs.io/en/latest/user-manual.html#dappmanager) diff --git a/build/src/src/modules/packages.js b/build/src/src/modules/packages.js index 42f1599b3..980618a5f 100644 --- a/build/src/src/modules/packages.js +++ b/build/src/src/modules/packages.js @@ -26,8 +26,10 @@ async function download({ pkg, id }) { // call IPFS, store the file in the repo's folder // load the image to docker const { manifest } = pkg; - const { name, isCore } = manifest; - const imageName = manifest.image.path; + const { name, version, isCore } = manifest; + // Construct image path, if not provided + // "admin.dnp.dappnode.eth_0.2.0.tar.xz" + const imageName = manifest.image.path || `${name}_${version}.tar.xz`; const imageHash = manifest.image.hash; const imageSize = manifest.image.size; diff --git a/dappnode_package.json b/dappnode_package.json index 1de5e99f9..aaafbdcd2 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -22,9 +22,9 @@ "Eduardo Antuña (https://github.com/eduadiez)", "DAppLion (https://github.com/dapplion)" ], - "keywords": ["DAppNodeCore", "DAPP", "Manager", "Installer"], - "homepage": { - "adminui": "http://my.admin.dnp.dappnode.eth/", + "keywords": ["DAppNodeCore", "Manager", "Installer"], + "links": { + "ui": "http://my.dappnode/", "homepage": "https://github.com/dappnode/DNP_DAPPMANAGER#readme" }, "repository": {