Skip to content

Commit

Permalink
SKALE-1573 refactoring wip, add github releases to travis build
Browse files Browse the repository at this point in the history
  • Loading branch information
dmytrotkk committed Sep 26, 2019
1 parent c678e4c commit 4e4b935
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 89 deletions.
24 changes: 22 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
include:
#- stage: test
- stage: deploy
if: branch IN (develop, beta, stable, master)
if: branch IN (develop, beta, stable, master, SKALE-1573-new-architecture)
script:
- VERSION=$(BRANCH=$TRAVIS_BRANCH bash ./scripts/calculate_version.sh)
- echo "Version $VERSION"
Expand All @@ -30,6 +30,25 @@ jobs:
git push https://[email protected]/$TRAVIS_REPO_SLUG.git $TRAVIS_TAG
) || true
deploy:
- provider: releases
api_key: "$GITHUB_OAUTH_TOKEN"
skip_cleanup: true
name: $VERSION @ $(date +'%d.%m.%Y %R')
on:
repo: $TRAVIS_REPO_SLUG
branch: master
- provider: releases
api_key: "$GITHUB_OAUTH_TOKEN"
skip_cleanup: true
prerelease: true
name: $VERSION @ $(date +'%d.%m.%Y %R')
on:
repo: $TRAVIS_REPO_SLUG
branch:
- master
- develop
- beta
- SKALE-1573-new-architecture
- provider: script
skip_cleanup: true
script: RELEASE=true bash $TRAVIS_BUILD_DIR/scripts/publish.sh
Expand All @@ -44,4 +63,5 @@ jobs:
repo: $TRAVIS_REPO_SLUG
branch:
- develop
- beta
- beta
- SKALE-1573-new-architecture
4 changes: 1 addition & 3 deletions app.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@

from core.node import Node
from core.local_wallet import LocalWallet
from core.containers import Containers

from tools.helper import get_sentry_env_name
from tools.config import NODE_CONFIG_FILEPATH, DB_FILE, FLASK_SECRET_KEY_FILE, CONTAINERS_FILEPATH
Expand Down Expand Up @@ -63,7 +62,6 @@
config = ConfigStorage(NODE_CONFIG_FILEPATH)
docker_manager = DockerManager(CONTAINERS_FILEPATH)
node = Node(skale, config, wallet, docker_manager)
containers = Containers(skale, config)
token_utils = TokenUtils()
user_session = UserSession(session)

Expand All @@ -82,7 +80,7 @@
app = Flask(__name__)
app.register_blueprint(construct_auth_bp(user_session, token))
app.register_blueprint(web_logs)
app.register_blueprint(construct_nodes_bp(skale, node, containers))
app.register_blueprint(construct_nodes_bp(skale, node))
app.register_blueprint(construct_schains_bp(skale, wallet, containers, node))
app.register_blueprint(construct_wallet_bp(wallet))
app.register_blueprint(construct_node_info_bp(skale, wallet))
Expand Down
83 changes: 0 additions & 83 deletions core/containers.py

This file was deleted.

2 changes: 1 addition & 1 deletion web/routes/nodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
logger = logging.getLogger(__name__)


def construct_nodes_bp(skale, node, containers):
def construct_nodes_bp(skale, node):
nodes_bp = Blueprint('nodes', __name__)

@nodes_bp.route('/node-info', methods=['GET'])
Expand Down

0 comments on commit 4e4b935

Please sign in to comment.