From 019c1e624d9a21c4e73519b20929bfc8c51eeb84 Mon Sep 17 00:00:00 2001 From: Rezart Qelibari Date: Tue, 18 Sep 2018 21:27:47 +0200 Subject: [PATCH] Merge scripts for steps in dispatch script --- .travis.yml | 11 ++++++++--- ci/linux/after_success.sh | 3 --- ci/linux/dispatch.sh | 16 ++++++++++++++++ ci/linux/install.sh | 7 ------- ci/linux/script.sh | 3 --- ci/osx/after_success.sh | 3 --- ci/osx/dispatch.sh | 16 ++++++++++++++++ ci/osx/install.sh | 7 ------- ci/osx/script.sh | 3 --- 9 files changed, 40 insertions(+), 29 deletions(-) delete mode 100644 ci/linux/after_success.sh create mode 100644 ci/linux/dispatch.sh delete mode 100644 ci/linux/install.sh delete mode 100644 ci/linux/script.sh delete mode 100644 ci/osx/after_success.sh create mode 100644 ci/osx/dispatch.sh delete mode 100644 ci/osx/install.sh delete mode 100644 ci/osx/script.sh diff --git a/.travis.yml b/.travis.yml index 5a18fddcfd..fec4b38951 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,18 +33,23 @@ cache: - "${CASADIPATH}" before_install: + - SECTION='before_install' - export SCRIPT_DIR="${TRAVIS_BUILD_DIR}/ci/${TRAVIS_OS_NAME}" - export SHARED_SCRIPT_DIR="${TRAVIS_BUILD_DIR}/ci/shared" + - source "${SCRIPT_DIR}/dispatch.sh" install: - - source "${SCRIPT_DIR}/install.sh" + - SECTION='install' + - source "${SCRIPT_DIR}/dispatch.sh" script: - - source "${SCRIPT_DIR}/script.sh" + - SECTION='script' + - source "${SCRIPT_DIR}/dispatch.sh" after_success: + - SECTION='after_success' - mkdir -p "${DEPLOY_FOLDER}" - - source "${SCRIPT_DIR}/after_success.sh" + - source "${SCRIPT_DIR}/dispatch.sh" deploy: provider: releases diff --git a/ci/linux/after_success.sh b/ci/linux/after_success.sh deleted file mode 100644 index d30580c2d9..0000000000 --- a/ci/linux/after_success.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -e - -source "${SHARED_SCRIPT_DIR}/after_success_package_release.sh"; \ No newline at end of file diff --git a/ci/linux/dispatch.sh b/ci/linux/dispatch.sh new file mode 100644 index 0000000000..6c071937a2 --- /dev/null +++ b/ci/linux/dispatch.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +if [ "${SECTION}" = 'install' ]; then + source "${SCRIPT_DIR}/install_apt_dependencies.sh"; + source "${SCRIPT_DIR}/install_python_dependencies.sh"; + source "${SHARED_SCRIPT_DIR}/install_eigen.sh"; + source "${SCRIPT_DIR}/install_casadi.sh"; + source "${SHARED_SCRIPT_DIR}/install_swig.sh"; + +elif [ "${SECTION}" = 'script' ]; then + source "${SHARED_SCRIPT_DIR}/script_acados_release.sh"; + +elif [ "${SECTION}" = 'after_success' ]; then + source "${SHARED_SCRIPT_DIR}/after_success_package_release.sh"; + +fi diff --git a/ci/linux/install.sh b/ci/linux/install.sh deleted file mode 100644 index e3cd8454b5..0000000000 --- a/ci/linux/install.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -e - -source "${SCRIPT_DIR}/install_apt_dependencies.sh"; -source "${SCRIPT_DIR}/install_python_dependencies.sh"; -source "${SHARED_SCRIPT_DIR}/install_eigen.sh"; -source "${SCRIPT_DIR}/install_casadi.sh"; -source "${SHARED_SCRIPT_DIR}/install_swig.sh"; \ No newline at end of file diff --git a/ci/linux/script.sh b/ci/linux/script.sh deleted file mode 100644 index 7c58d25aa5..0000000000 --- a/ci/linux/script.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -e - -source "${SHARED_SCRIPT_DIR}/script_acados_release.sh"; \ No newline at end of file diff --git a/ci/osx/after_success.sh b/ci/osx/after_success.sh deleted file mode 100644 index d30580c2d9..0000000000 --- a/ci/osx/after_success.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -e - -source "${SHARED_SCRIPT_DIR}/after_success_package_release.sh"; \ No newline at end of file diff --git a/ci/osx/dispatch.sh b/ci/osx/dispatch.sh new file mode 100644 index 0000000000..d63336a56c --- /dev/null +++ b/ci/osx/dispatch.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +if [ "${SECTION}" = 'install' ]; then + source "${SCRIPT_DIR}/install_ccache.sh"; + source "${SCRIPT_DIR}/install_python_dependencies.sh"; + source "${SHARED_SCRIPT_DIR}/install_eigen.sh"; + source "${SHARED_SCRIPT_DIR}/install_swig.sh"; + source "${SCRIPT_DIR}/install_casadi.sh"; + +elif [ "${SECTION}" = 'script' ]; then + source "${SHARED_SCRIPT_DIR}/script_acados_release.sh"; + +elif [ "${SECTION}" = 'after_success' ]; then + source "${SHARED_SCRIPT_DIR}/after_success_package_release.sh"; + +fi diff --git a/ci/osx/install.sh b/ci/osx/install.sh deleted file mode 100644 index 8a81174553..0000000000 --- a/ci/osx/install.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -e - -source "${SCRIPT_DIR}/install_ccache.sh"; -source "${SCRIPT_DIR}/install_python_dependencies.sh"; -source "${SHARED_SCRIPT_DIR}/install_eigen.sh"; -source "${SHARED_SCRIPT_DIR}/install_swig.sh"; -source "${SCRIPT_DIR}/install_casadi.sh"; \ No newline at end of file diff --git a/ci/osx/script.sh b/ci/osx/script.sh deleted file mode 100644 index 7c58d25aa5..0000000000 --- a/ci/osx/script.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -e - -source "${SHARED_SCRIPT_DIR}/script_acados_release.sh"; \ No newline at end of file