Browse Source

Fix CI shell

Signed-off-by: falkTX <falktx@falktx.com>
tags/v1.0
falkTX 5 years ago
parent
commit
fcdd8da936
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 39 additions and 41 deletions
  1. +4
    -4
      .travis.yml
  2. +35
    -37
      setup/check_target.sh

+ 4
- 4
.travis.yml View File

@@ -35,14 +35,14 @@ jobs:
- PLUGINS="dpf-plugins"

before_install:
- sh ${TRAVIS_BUILD_DIR}/.travis/before_install.sh
- bash ${TRAVIS_BUILD_DIR}/.travis/before_install.sh

install:
- sh ${TRAVIS_BUILD_DIR}/.travis/install.sh
- bash ${TRAVIS_BUILD_DIR}/.travis/install.sh

script:
- sh ${TRAVIS_BUILD_DIR}/bootstrap.sh ${TARGET}
- sh ${TRAVIS_BUILD_DIR}/build-plugin.sh ${TARGET} ${PLUGINS}
- bash ${TRAVIS_BUILD_DIR}/bootstrap.sh ${TARGET}
- bash ${TRAVIS_BUILD_DIR}/build-plugin.sh ${TARGET} ${PLUGINS}

notifications:
email: true


+ 35
- 37
setup/check_target.sh View File

@@ -8,43 +8,41 @@ WIN32=0
WIN64=0

function check_target() {

case ${target} in
"macos")
MACOS=1
;;
"macos-old")
MACOS=1
MACOS_OLD=1
CROSS_COMPILING=1
;;
"win32")
WIN32=1
CROSS_COMPILING=1
;;
"win64")
WIN32=1
WIN64=1
CROSS_COMPILING=1
;;
"Linux")
LINUX=1
;;
"native")
target=$(uname -s)
check_target
;;
default)
echo "Invalid target '${target}', possible values are:"
echo "\tmacos"
echo "\tmacos-old"
echo "\twin32"
echo "\twin64"
echo "\tnative"
exit 2
;;
esac

case "${target}" in
"macos")
MACOS=1
;;
"macos-old")
MACOS=1
MACOS_OLD=1
CROSS_COMPILING=1
;;
"win32")
WIN32=1
CROSS_COMPILING=1
;;
"win64")
WIN32=1
WIN64=1
CROSS_COMPILING=1
;;
"Linux")
LINUX=1
;;
"native")
target=$(uname -s)
check_target
;;
default)
echo "Invalid target '${target}', possible values are:"
echo "\tmacos"
echo "\tmacos-old"
echo "\twin32"
echo "\twin64"
echo "\tnative"
exit 2
;;
esac
}

check_target

Loading…
Cancel
Save