Skip to content

Commit

Permalink
Merge pull request #3 from dappnode/v0.2.3
Browse files Browse the repository at this point in the history
Bump Geth to v1.8.27
  • Loading branch information
eduadiez authored May 13, 2019
2 parents bc6f2a0 + a74f053 commit af8d694
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 14 deletions.
27 changes: 20 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,22 @@
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: build-test
if: tag != "release"
if: tag !~ /^release\/(major|minor|patch)$/
- name: release
if: tag = "release"
if: tag =~ /^release\/(major|minor|patch)$/

jobs:
include:
Expand All @@ -29,14 +39,18 @@ jobs:
script:
- npm install -g @dappnode/dappnodesdk
- docker-compose build
- dappnodesdk publish patch -p infura -a $DEV
node_js: lts/*
- "TYPE=${TRAVIS_TAG##*/}"
- "[ ! '$TYPE' = 'release' ] || TYPE='patch'"
- dappnodesdk publish ${TYPE} -p infura -a ${DEV}
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 @@ -46,9 +60,8 @@ jobs:
name: "$TRAVIS_TAG"
body: "# Changelog"
on:
branch: master
tags: true
condition: "$TRAVIS_TAG =~ ^release*$"
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
[![RIOT DAppNode](https://img.shields.io/badge/RIOT-DAppNode-blue.svg)](https://riot.im/app/#/room/#DAppNode:matrix.org)
[![Twitter Follow](https://img.shields.io/twitter/follow/espadrine.svg?style=social&label=Follow)](https://twitter.com/DAppNode?lang=es)

Dappnode package responsible for providing the Rinkeby chain ( based on go-ethereum v1.8.17)
Dappnode package responsible for providing the Rinkeby chain ( based on go-ethereum v1.8.27)

Aragon Package Manager Repo at [0x2dbc4622fde0dc5d1d1c6fc908678cddba81c189](https://etherscan.io/address/0x2dbc4622fde0dc5d1d1c6fc908678cddba81c189)

Expand Down
Binary file added avatar-rinkeby.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ WORKDIR /usr/src/app

RUN apk add --no-cache make gcc musl-dev linux-headers git

ARG BRANCH=v1.8.21
ARG BRANCH=v1.8.27

RUN git clone -b $BRANCH https://github.com/ethereum/go-ethereum.git
RUN cd go-ethereum && make geth
Expand Down
9 changes: 5 additions & 4 deletions dappnode_package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"name": "rinkeby.dnp.dappnode.eth",
"version": "0.2.2",
"description": "Rinkeby chain for DAppNode based on go-ethereum v1.8.21",
"avatar": "/ipfs/QmShX6GQ7j3893zRuyLU6mryuPaNufyjFqLy7xJRSFaMMa",
"version": "0.2.3",
"description": "Rinkeby chain for DAppNode based on go-ethereum v1.8.27",
"avatar": "/ipfs/QmTfnrUdZWaMgr2Zi1h1Z7zS5CbYtQZRs72yqKZQHj5fxT",
"type": "library",
"chain": "ethereum",
"image": {
"path": "",
"hash": "",
Expand All @@ -17,7 +18,7 @@
"rinkeby:/root/.ethereum/rinkeby"
],
"environment": [
"EXTRA_OPTS"
"EXTRA_OPTS=--rpcapi eth,net,web3,txpool"
]
},
"author": "DAppNode Association <[email protected]> (https://github.com/dappnode)",
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3.4'
services:
rinkeby.dnp.dappnode.eth:
image: 'rinkeby.dnp.dappnode.eth:0.2.2'
image: 'rinkeby.dnp.dappnode.eth:0.2.3'
build: ./build
volumes:
- 'rinkeby:/root/.ethereum/rinkeby'
Expand Down
Binary file removed rinkeby.png
Binary file not shown.

0 comments on commit af8d694

Please sign in to comment.