From 212725e44d17dec531dd4118400d349d3dff4fc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Fri, 14 Dec 2018 20:13:15 +0100 Subject: [PATCH] Minor changes --- .travis.yml | 20 ++++++++++---------- scripts/docker_push.sh | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5902c6031..b510062b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,16 @@ script: - docker-compose exec backend yarn run db:reset - docker-compose exec backend yarn run db:seed +after_success: + - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh + - chmod +x send.sh + - ./send.sh success $WEBHOOK_URL + +after_failure: + - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh + - chmod +x send.sh + - ./send.sh failure $WEBHOOK_URL + deploy: - provider: script script: scripts/docker_push.sh @@ -45,13 +55,3 @@ deploy: on: tags: true all_branches: true - -after_success: - - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh - - chmod +x send.sh - - ./send.sh success $WEBHOOK_URL - -after_failure: - - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh - - chmod +x send.sh - - ./send.sh failure $WEBHOOK_URL diff --git a/scripts/docker_push.sh b/scripts/docker_push.sh index 09a2d87e8..a0d46ffd3 100755 --- a/scripts/docker_push.sh +++ b/scripts/docker_push.sh @@ -1,3 +1,3 @@ -#!/bin/bash +#!/usr/bin/env bash echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin docker push humanconnection/nitro-backend:latest