Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Nodemcu Firmware
Commits
9842a8ef
Commit
9842a8ef
authored
Apr 09, 2019
by
Gregor Hartmann
Committed by
Terry Ellison
Apr 09, 2019
Browse files
Add building luac.cross to travis ci builds (#2682)
Add building luac.cross to travis ci builds
parent
52b192c6
Changes
4
Hide whitespace changes
Inline
Side-by-side
.travis.yml
View file @
9842a8ef
#os:
# - windows
# - linux
language
:
cpp
language
:
cpp
matrix
:
include
:
-
os
:
linux
env
:
-
OS="$TRAVIS_OS_NAME"
-
LUACC=./luac.cross
-
os
:
windows
env
:
-
MSBUILD_PATH="c:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin"
-
OS="$TRAVIS_OS_NAME"
-
LUACC=msvc/luac-cross/x64/Debug/luac.cross.exe
addons
:
addons
:
apt
:
apt
:
packages
:
packages
:
...
@@ -8,16 +24,12 @@ cache:
...
@@ -8,16 +24,12 @@ cache:
-
directories
:
-
directories
:
-
cache
-
cache
script
:
script
:
-
export BUILD_DATE=$(date +%Y%m%d)
-
echo OS is $OS $TRAVIS_OS_NAME
-
make EXTRA_CCFLAGS="-DBUILD_DATE='\"'$BUILD_DATE'\"'" all
-
cd bin/
-
file_name_float="nodemcu_float_${TRAVIS_TAG}.bin"
-
srec_cat -output ${file_name_float} -binary 0x00000.bin -binary -fill 0xff 0x00000 0x10000 0x10000.bin -binary -offset 0x10000
-
cd ../
-
make clean
-
make EXTRA_CCFLAGS="-DLUA_NUMBER_INTEGRAL -DBUILD_DATE='\"'$BUILD_DATE'\"'"
-
cd bin/
-
file_name_integer="nodemcu_integer_${TRAVIS_TAG}.bin"
-
srec_cat -output ${file_name_integer} -binary 0x00000.bin -binary -fill 0xff 0x00000 0x10000 0x10000.bin -binary -offset 0x10000
# http://docs.travis-ci.com/user/environment-variables/#Convenience-Variables
# http://docs.travis-ci.com/user/environment-variables/#Convenience-Variables
-
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash "$TRAVIS_BUILD_DIR"/tools/pr-build.sh; fi
-
if [ "$OS" = "linux" ]; then bash "$TRAVIS_BUILD_DIR"/tools/travis/ci-build-linux.sh; fi
-
if [ "$OS" = "windows" ]; then bash "$TRAVIS_BUILD_DIR"/tools/travis/ci-build-windows-ms.sh; fi
-
if [ "$OS" = "linux" -a "$TRAVIS_PULL_REQUEST" != "false" ]; then bash "$TRAVIS_BUILD_DIR"/tools/travis/pr-build.sh; fi
-
cd "$TRAVIS_BUILD_DIR"
-
LUA_FILES=`find lua_modules lua_examples -iname "*.lua"`
-
echo checking $LUA_FILES
-
$LUACC -p $LUA_FILES
tools/travis/ci-build-linux.sh
0 → 100644
View file @
9842a8ef
#!/bin/sh
set
-e
echo
"Running ci build for linux"
(
cd
"
$TRAVIS_BUILD_DIR
"
||
exit
export
BUILD_DATE
=
$(
date
+%Y%m%d
)
# build integer firmware
make
EXTRA_CCFLAGS
=
"-DLUA_NUMBER_INTEGRAL -DBUILD_DATE='
\"
'
$BUILD_DATE
'
\"
'"
cd
bin/
||
exit
file_name_integer
=
"nodemcu_integer_
${
TRAVIS_TAG
}
.bin"
srec_cat
-output
${
file_name_integer
}
-binary
0x00000.bin
-binary
-fill
0xff 0x00000 0x10000 0x10000.bin
-binary
-offset
0x10000
cd
../
||
exit
# build float firmware
make clean
make
EXTRA_CCFLAGS
=
"-DBUILD_DATE='
\"
'
$BUILD_DATE
'
\"
'"
all
cd
bin/
||
exit
file_name_float
=
"nodemcu_float_
${
TRAVIS_TAG
}
.bin"
srec_cat
-output
${
file_name_float
}
-binary
0x00000.bin
-binary
-fill
0xff 0x00000 0x10000 0x10000.bin
-binary
-offset
0x10000
)
tools/travis/ci-build-windows-ms.sh
0 → 100644
View file @
9842a8ef
#!/bin/sh
set
-e
echo
"Running ci build for windows msbuild (supports only hosttools)"
(
cd
"
$TRAVIS_BUILD_DIR
"
/msvc
||
exit
export
PATH
=
$MSBUILD_PATH
:
$PATH
msbuild.exe hosttools.sln
)
tools/pr-build.sh
→
tools/
travis/
pr-build.sh
View file @
9842a8ef
...
@@ -29,8 +29,4 @@ cd "$TRAVIS_BUILD_DIR"/ld || exit
...
@@ -29,8 +29,4 @@ cd "$TRAVIS_BUILD_DIR"/ld || exit
cd
"
$TRAVIS_BUILD_DIR
"
||
exit
cd
"
$TRAVIS_BUILD_DIR
"
||
exit
make clean
make clean
make
make
LUA_FILES
=
`
find lua_modules lua_examples
-iname
"*.lua"
`
echo
checking
$LUA_FILES
./luac.cross
-p
$LUA_FILES
)
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment