Update Travis.

This commit is contained in:
Markus F.X.J. Oberhumer
2017-04-10 09:51:35 +02:00
parent 940514e5ca
commit 8848fe35f6
7 changed files with 53 additions and 29 deletions
+4 -2
View File
@@ -27,5 +27,7 @@ Just read it and fill in the details we're asking, it saves so much of our time.
## Please tell us details about your environment.
<!--- Include as many relevant details about the environment you experienced the bug in -->
* UPX version used (`upx --version`):
* Operating System and version:
* CPU architecture:
* Host Operating System and version:
* Host CPU architecture:
* Target Operating System and version:
* Target CPU architecture:
+3 -1
View File
@@ -51,7 +51,7 @@ if [[ $BM_X =~ (^|\+)rebuild-stubs($|\+) ]]; then
extra_subdirs+=( src/stub/src/arch/amd64 )
extra_subdirs+=( src/stub/src/arch/arm/v4a )
extra_subdirs+=( src/stub/src/arch/arm/v4t )
#extra_subdirs+=( src/stub/src/arch/arm64/v8 ) # FIXME / TODO
extra_subdirs+=( src/stub/src/arch/arm64/v8 )
extra_subdirs+=( src/stub/src/arch/i386 )
extra_subdirs+=( src/stub/src/arch/m68k/m68000 )
extra_subdirs+=( src/stub/src/arch/m68k/m68020 )
@@ -63,6 +63,7 @@ if [[ $BM_X =~ (^|\+)rebuild-stubs($|\+) ]]; then
make -C $d -f Makefile.extra maintainer-clean
git status $d || true
done
git status src/stub/src || true
git status || true
failed=0
for d in ${extra_subdirs[@]}; do
@@ -79,6 +80,7 @@ if [[ $BM_X =~ (^|\+)rebuild-stubs($|\+) ]]; then
echo "UPX-ERROR: FATAL: rebuild-stubs git status mismatch. See log file."
exit 1
fi
git status
if [[ $BM_X == rebuild-stubs ]]; then
echo "X=rebuild-stubs done. Exiting."
exit 0
+12 -7
View File
@@ -96,6 +96,12 @@ else
fi
d=$d-$BM_C-$BM_B
if [[ -n $subdir ]]; then
print_header "DEPLOY $subdir/$d"
else
print_header "DEPLOY $d"
fi
mkdir $d || exit 1
for exeext in .exe .out; do
f=$upx_BUILDDIR/upx$exeext
@@ -120,8 +126,9 @@ git config user.name "$git_user"
git config user.email "none@none"
if [[ $new_branch == 1 ]]; then
git checkout --orphan $branch
git reset --hard
git reset --hard || true
fi
git ls-files -v
if [[ -n $subdir ]]; then
[[ -d $subdir ]] || mkdir $subdir
@@ -140,7 +147,7 @@ fi
now=$(date '+%s')
##date=$(TZ=UTC0 date -d "@$now" '+%Y-%m-%d %H:%M:%S')
git commit --date="$now" -m "Automatic build $d"
git ls-files
git ls-files -v
#git log --pretty=fuller
umask 077
@@ -166,13 +173,11 @@ while true; do
else
if git push $ssh_repo $branch; then break; fi
fi
git branch -a -v
git fetch -v origin $branch
git branch -a -v
if [[ $new_branch == 1 ]]; then
git branch --set-upstream-to origin/$branch
new_branch=0
fi
git rebase origin/$branch
git rebase FETCH_HEAD
git branch -a -v
sleep $((RANDOM % 5 + 1))
let i+=1
done
+5
View File
@@ -214,6 +214,11 @@ done
make_absolute lcov_OUTPUTDIR
unset var_prefix var_suffix
print_header() {
local x="==========="; x="$x$x$x$x$x$x$x"
echo -e "\n${x}\n${1}\n${x}\n"
}
print_settings() {
local v var_prefix var_suffix
# Build Matrix
+1 -2
View File
@@ -36,8 +36,7 @@ if [[ ! -d $upx_testsuite_SRCDIR/files/packed ]]; then exit 1; fi
# ************************************************************************/
testsuite_header() {
local x="==========="; x="$x$x$x$x$x$x$x"
echo -e "\n${x}\n${1}\n${x}\n"
print_header "$1"
}
testsuite_split_f() {