hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #3894 from LMMS/fix/scripts

Browse Source 
Fix shellcheck failing on master
This commit is contained in:
Lukas W
2017-10-19 08:38:08 +02:00
committed by GitHub
parent 9fd77a4959 ae73fa4521
commit 01a6cb13f7
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.travis/common/windows-build.sh
View File

@@ -1,15 +1,16 @@
#!/usr/bin/env bash
set -e
CPUS=$(cat /proc/cpuinfo | grep bogo | wc -l)
CPUS=$(grep -c bogo /proc/cpuinfo)
cd /lmms
mkdir build
cd build
../cmake/build_mingw$1.sh
../cmake/build_mingw"$1".sh
echo Building on $CPUS CPUs
echo Building on "$CPUS" CPUs
make -j$((CPUS+1))
make package

2
.travis/linux.win32.before_install.sh
View File

@@ -2,5 +2,5 @@
set -e
docker build -t lmms-build ${TRAVIS_BUILD_DIR}/.travis/linux.cross.win32/
docker build -t lmms-build "${TRAVIS_BUILD_DIR}/.travis/linux.cross.win32/"

2
.travis/linux.win32.script.sh
View File

@@ -3,5 +3,5 @@
set -e
export CMAKE_OPTS="$CMAKE_FLAGS -DUSE_WERROR=ON"
docker run -v ${TRAVIS_BUILD_DIR}:/lmms:rw lmms-build /bin/sh /lmms/.travis/linux.cross.win32/script.sh
docker run -v "${TRAVIS_BUILD_DIR}":/lmms:rw lmms-build /bin/sh /lmms/.travis/linux.cross.win32/script.sh

2
.travis/linux.win64.before_install.sh
View File

@@ -2,5 +2,5 @@
set -e
docker build -t lmms-build ${TRAVIS_BUILD_DIR}/.travis/linux.cross.win64/
docker build -t lmms-build "${TRAVIS_BUILD_DIR}/.travis/linux.cross.win64/"

2
.travis/linux.win64.script.sh
View File

@@ -3,5 +3,5 @@
set -e
export CMAKE_OPTS="$CMAKE_FLAGS -DUSE_WERROR=ON"
docker run -v ${TRAVIS_BUILD_DIR}:/lmms:rw lmms-build /bin/sh /lmms/.travis/linux.cross.win64/script.sh
docker run -v "${TRAVIS_BUILD_DIR}":/lmms:rw lmms-build /bin/sh /lmms/.travis/linux.cross.win64/script.sh