Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9454 from dra27/faster-appveyor 

AppVeyor speed-ups
master
David Allsopp 2020-04-20 09:53:51 +01:00 committed by GitHub
parent 91bbdac1f5 eaa2a01eeb
commit c97b73c056
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 66 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
appveyor.yml
View File

@ -37,6 +37,7 @@ matrix:
cache:
- C:\cygwin64\var\cache\setup
- C:\projects\cache
install:
# This is a hangover from monitoring effects of MPR#7452

2
testsuite/Makefile
View File

@ -13,6 +13,8 @@
#* *
#**************************************************************************
.NOTPARALLEL:
BASEDIR := $(shell pwd)
NO_PRINT=`$(MAKE) empty --no-print-directory >/dev/null 2>&1 \
&& echo --no-print-directory`

2
testsuite/lib/Makefile
View File

@ -13,6 +13,8 @@
#* *
#**************************************************************************
.NOTPARALLEL:
TOPDIR = ../..
COMPFLAGS ?=
RUNTIME_VARIANT ?=

2
testsuite/tests/tool-ocamldep-modalias/Makefile.build
View File

@ -5,6 +5,8 @@
# will not necessarily be ran by GNU make
# The same holds for $< and $@
.NOTPARALLEL:
SOURCES = A.ml B.ml C.ml D.ml
OBJECTS = lib.cmo $(SOURCES:%.ml=Lib%.cmo)
NOBJECTS = $(OBJECTS:%.cmo=%.cmx)

2
testsuite/tests/tool-ocamldep-modalias/Makefile.build2
View File

@ -5,6 +5,8 @@
# will not necessarily be ran by GNU make
# The same holds for $< and $@
.NOTPARALLEL:
SOURCES = A.ml B.ml C.ml
OBJECTS = $(SOURCES:%.ml=Lib%.cmo)
NOBJECTS = $(OBJECTS:%.cmo=%.cmx)

2
testsuite/tools/Makefile
View File

@ -12,6 +12,8 @@
#* *
#**************************************************************************
.NOTPARALLEL:
TOPDIR = ../..
COMPILERLIBSDIR = $(TOPDIR)/compilerlibs

26
tools/ci/appveyor/appveyor_build.cmd
View File

@ -20,7 +20,31 @@
@rem Do not call setlocal!
@echo off
goto %1
if "%1" neq "install" goto %1
setlocal enabledelayedexpansion
echo AppVeyor Environment
for %%K in (ACCOUNT_NAME ACS_DEPLOYMENT_UPGRADE_MODE API_URL
ARTIFACT_UPLOAD_TIMEOUT BUILD_FOLDER BUILD_ID BUILD_NUMBER
BUILD_VERSION BUILD_WORKER_IMAGE BUILD_WORKER_IMAGE
CACHE_ENTRY_UPLOAD_DOWNLOAD_TIMEOUT CACHE_SKIP_RESTORE
CACHE_SKIP_SAVE FILE_DOWNLOAD_TIMEOUT FORCED_BUILD
IGNORE_COMMIT_FILTERING_ON_TAG JOB_ID JOB_NAME JOB_NUMBER PROJECT_ID
PROJECT_NAME PROJECT_SLUG PULL_REQUEST_HEAD_COMMIT
PULL_REQUEST_HEAD_REPO_BRANCH PULL_REQUEST_HEAD_REPO_NAME
PULL_REQUEST_NUMBER PULL_REQUEST_TITLE RE_BUILD REPO_BRANCH
REPO_COMMIT_AUTHOR REPO_COMMIT_AUTHOR_EMAIL REPO_COMMIT
REPO_COMMIT_MESSAGE REPO_COMMIT_MESSAGE_EXTENDED
REPO_COMMIT_TIMESTAMP REPO_NAME REPO_PROVIDER REPO_SCM
REPOSITORY_SHALLOW_CLONE_TIMEOUT REPO_TAG_NAME REPO_TAG
RE_RUN_INCOMPLETE SAVE_CACHE_ON_ERROR SCHEDULED_BUILD
SKIP_FINALIZE_ON_EXIT APPVEYOR URL WAP_ARTIFACT_NAME
WAP_SKIP_ACLS) do echo APPVEYOR_%%K=!APPVEYOR_%%K!
echo CI=%CI%
echo CONFIGURATION=%CONFIGURATION%
echo PLATFORM=%PLATFORM%
endlocal
goto install
goto :EOF

44
tools/ci/appveyor/appveyor_build.sh
View File

@ -17,6 +17,15 @@ set -e
BUILD_PID=0
# This must correspond with the entry in appveyor.yml
CACHE_DIRECTORY=/cygdrive/c/projects/cache
if [[ -z $APPVEYOR_PULL_REQUEST_HEAD_COMMIT ]] ; then
MAKE="make -j"
else
MAKE=make
fi
function run {
NAME=$1
shift
@ -56,7 +65,12 @@ function set_configuration {
;;
esac
./configure $build $host --prefix="$2" --enable-ocamltest
mkdir -p "$CACHE_DIRECTORY"
./configure --cache-file="$CACHE_DIRECTORY/config.cache-$1" \
$build $host --prefix="$2" --enable-ocamltest || ( \
rm -f "$CACHE_DIRECTORY/config.cache-$1" ; \
./configure --cache-file="$CACHE_DIRECTORY/config.cache-$1" \
$build $host --prefix="$2" --enable-ocamltest )
FILE=$(pwd | cygpath -f - -m)/Makefile.config
echo "Edit $FILE to turn C compiler warnings into errors"
@ -93,10 +107,10 @@ case "$1" in
set_configuration msvc "$OCAMLROOT-msvc32" -WX
run 'make world' make world
run 'make runtimeopt' make runtimeopt
run 'make -C otherlibs/systhreads libthreadsnat.lib' \
make -C otherlibs/systhreads libthreadsnat.lib
run "$MAKE world" $MAKE world
run "$MAKE runtimeopt" $MAKE runtimeopt
run "$MAKE -C otherlibs/systhreads libthreadsnat.lib" \
$MAKE -C otherlibs/systhreads libthreadsnat.lib
exit 0
;;
@ -108,10 +122,11 @@ case "$1" in
"$FULL_BUILD_PREFIX-$PORT/tools/check-symbol-names" \
$FULL_BUILD_PREFIX-$PORT/runtime/*.a
fi
run "test $PORT" make -C "$FULL_BUILD_PREFIX-$PORT" tests
run "install $PORT" make -C "$FULL_BUILD_PREFIX-$PORT" install
run "test $PORT" $MAKE -C "$FULL_BUILD_PREFIX-$PORT" tests
run "install $PORT" $MAKE -C "$FULL_BUILD_PREFIX-$PORT" install
if [[ $PORT = 'msvc64' ]] ; then
run 'check_all_arches' make -C "$FULL_BUILD_PREFIX-$PORT" check_all_arches
run "$MAKE check_all_arches" \
$MAKE -C "$FULL_BUILD_PREFIX-$PORT" check_all_arches
fi
;;
*)
@ -120,7 +135,7 @@ case "$1" in
if [[ $PORT = 'msvc64' ]] ; then
tar -xzf "$APPVEYOR_BUILD_FOLDER/flexdll.tar.gz"
cd "flexdll-$FLEXDLL_VERSION"
make MSVC_DETECT=0 CHAINS=msvc64 support
$MAKE MSVC_DETECT=0 CHAINS=msvc64 support
cp flexdll*_msvc64.obj "$OCAMLROOT/bin/flexdll/"
cd ..
fi
@ -140,16 +155,17 @@ case "$1" in
# For an explanation of the sed command, see
# https://github.com/appveyor/ci/issues/1824
script --quiet --return --command \
"make -C ../$BUILD_PREFIX-mingw32 flexdll world.opt" \
"$MAKE -C ../$BUILD_PREFIX-mingw32 flexdll && "\
"$MAKE -C ../$BUILD_PREFIX-mingw32 world.opt" \
"../$BUILD_PREFIX-mingw32/build.log" |
sed -e 's/\d027\[K//g' \
-e 's/\d027\[m/\d027[0m/g' \
-e 's/\d027\[01\([m;]\)/\d027[1\1/g'
else
run 'make world' make world
run 'make bootstrap' make bootstrap
run 'make opt' make opt
run 'make opt.opt' make opt.opt
run "$MAKE world" $MAKE world
run "$MAKE bootstrap" $MAKE bootstrap
run "$MAKE opt" $MAKE opt
run "$MAKE opt.opt" $MAKE opt.opt
fi
;;