Skip to content

Commit

Permalink
Prepare for v0.2.0 release
Browse files Browse the repository at this point in the history
Change build-test condition

overwrite: true
  • Loading branch information
dapplion committed Apr 29, 2019
1 parent e2f7669 commit 2c8391d
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 15 deletions.
31 changes: 21 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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)$/

Expand Down Expand Up @@ -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
Expand All @@ -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
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
<p align="center"><a href="https://github.com/dappnode/DAppNode"><img width="400" title="DAPPMANAGER" src='banner-dappmanager.png' /></a></p>

[![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)
Expand Down
6 changes: 4 additions & 2 deletions build/src/src/modules/packages.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions dappnode_package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
"Eduardo Antuña <[email protected]> (https://github.com/eduadiez)",
"DAppLion <[email protected]> (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": {
Expand Down

0 comments on commit 2c8391d

Please sign in to comment.