From ca8a11733592b918a5a71aa690fd1e4b0bb56820 Mon Sep 17 00:00:00 2001 From: Palakis Date: Sat, 15 Apr 2017 21:49:41 +0200 Subject: [PATCH] Travis: renamed some scripts --- .travis.yml | 11 ++++------- CI/{before-script-osx.sh => build-osx.sh} | 0 CI/{before-script-xenial.sh => build-xenial.sh} | 0 CI/{build-package-xenial.sh => package-xenial.sh} | 0 4 files changed, 4 insertions(+), 7 deletions(-) rename CI/{before-script-osx.sh => build-osx.sh} (100%) mode change 100755 => 100644 rename CI/{before-script-xenial.sh => build-xenial.sh} (100%) mode change 100755 => 100644 rename CI/{build-package-xenial.sh => package-xenial.sh} (100%) mode change 100755 => 100644 diff --git a/.travis.yml b/.travis.yml index 41786e3d..21bbfc44 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,15 +15,12 @@ matrix: before_install: - docker run -d --name xenial -v $(dirname $(pwd)):/root -w /root nimmis/ubuntu:16.04 - docker exec -it xenial /root/obs-websocket/CI/install-dependencies-xenial.sh - before_script: - - docker exec -it xenial /root/obs-websocket/CI/before-script-xenial.sh + script: + - docker exec -it xenial /root/obs-websocket/CI/build-xenial.sh after_success: - - docker exec -it xenial /root/obs-websocket/CI/build-package-xenial.sh + - docker exec -it xenial /root/obs-websocket/CI/package-xenial.sh - os: osx osx_image: xcode8.3 before_install: "./CI/install-dependencies-osx.sh" - before_script: "./CI/before-script-osx.sh" - -# build is already handled in before_script -script: true + script: "./CI/build-osx.sh" diff --git a/CI/before-script-osx.sh b/CI/build-osx.sh old mode 100755 new mode 100644 similarity index 100% rename from CI/before-script-osx.sh rename to CI/build-osx.sh diff --git a/CI/before-script-xenial.sh b/CI/build-xenial.sh old mode 100755 new mode 100644 similarity index 100% rename from CI/before-script-xenial.sh rename to CI/build-xenial.sh diff --git a/CI/build-package-xenial.sh b/CI/package-xenial.sh old mode 100755 new mode 100644 similarity index 100% rename from CI/build-package-xenial.sh rename to CI/package-xenial.sh