Skip to content

Commit

Permalink
Merge scripts for steps in dispatch script
Browse files Browse the repository at this point in the history
  • Loading branch information
rqelibari committed Sep 18, 2018
1 parent 4e9a811 commit 019c1e6
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 29 deletions.
11 changes: 8 additions & 3 deletions .travis.yml
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions ci/linux/after_success.sh

This file was deleted.

16 changes: 16 additions & 0 deletions 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
7 changes: 0 additions & 7 deletions ci/linux/install.sh

This file was deleted.

3 changes: 0 additions & 3 deletions ci/linux/script.sh

This file was deleted.

3 changes: 0 additions & 3 deletions ci/osx/after_success.sh

This file was deleted.

16 changes: 16 additions & 0 deletions 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
7 changes: 0 additions & 7 deletions ci/osx/install.sh

This file was deleted.

3 changes: 0 additions & 3 deletions ci/osx/script.sh

This file was deleted.

0 comments on commit 019c1e6

Please sign in to comment.