Skip to content
Permalink
Browse files

nightlies: also submit build errors to dash

  • Loading branch information
jef-n committed Feb 14, 2018
1 parent 543e4f0 commit 792c19ba707e272e0c83b793948358cb7feede4b
Showing with 22 additions and 8 deletions.
  1. +11 −4 debian/rules
  2. +11 −4 ms-windows/osgeo4w/package-nightly.cmd
@@ -220,7 +220,10 @@ override_dh_auto_configure:
dh_auto_configure -- $(CMAKE_OPTS)

override_dh_auto_build-arch:
ninja -C $(QGIS_BUILDDIR)
ninja -C $(QGIS_BUILDDIR) $(DEB_TEST_TARGET)Build || \
cat $(QGIS_BUILDDIR)/Testing/Temporary/LastBuild_$$(head -1 $(QGIS_BUILDDIR)/Testing/TAG).log || \
ninja -C $(QGIS_BUILDDIR) $(DEB_TEST_TARGET)Submit || \
false

override_dh_auto_build-indep:
ninja -C $(QGIS_BUILDDIR) apidoc
@@ -229,14 +232,18 @@ override_dh_auto_test: test-stamp

test-stamp:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
# Code to run the package test suite - and ignore the outcome for now
# Code to run the package test suite
rm -f $(QGIS_BUILDDIR)/.error
mkdir -p debian/tmp/locale/
localedef -f UTF-8 -i en_US ./debian/tmp/locale/en_US.UTF-8/
-LOCPATH=$(CURDIR)/debian/tmp/locale/ \
LOCPATH=$(CURDIR)/debian/tmp/locale/ \
LC_ALL=en_US.UTF-8 \
LD_LIBRARY_PATH=$(CURDIR)/$(QGIS_BUILDDIR)/output/lib:$(LD_LIBRARY_PATH) \
PATH=/usr/sbin:$(PATH) \
$(TESTMAKE) -C $(QGIS_BUILDDIR) $(DEB_TEST_TARGET)
$(TESTMAKE) -C $(QGIS_BUILDDIR) $(DEB_TEST_TARGET)Test || touch $(QGIS_BUILDDIR)/.error
$(TESTMAKE) -C $(QGIS_BUILDDIR) $(DEB_TEST_TARGET)Submit
# but ignore the outcome for now
# ! [ -f $(QGIS_BUILDDIR)/.error ]
else
@echo Skipping tests.
endif
@@ -205,9 +205,14 @@ if errorlevel 1 (echo clean failed & goto error)
:skipclean
if exist ..\skipbuild (echo skip build & goto skipbuild)
echo ALL_BUILD: %DATE% %TIME%
cmake --build %BUILDDIR% --config %BUILDCONF%
if errorlevel 1 cmake --build %BUILDDIR% --config %BUILDCONF%
if errorlevel 1 (echo build failed twice & goto error)
cmake --build %BUILDDIR% --target NightlyBuild --config %BUILDCONF%
if errorlevel 1 cmake --build %BUILDDIR% --target NightlyBuild --config %BUILDCONF%
if errorlevel 1 (
cmake --build %BUILDDIR% --target NightlySubmit --config %BUILDCONF%
if errorlevel 1 echo SUBMITTING BUILD ERRORS WAS NOT SUCCESSFUL.
echo build failed twice
goto error
)

:skipbuild
if exist ..\skiptests goto skiptests
@@ -230,8 +235,10 @@ for %%g IN (%GRASS_VERSIONS%) do (
PATH %path%;%BUILDDIR%\output\plugins
set QT_PLUGIN_PATH=%BUILDDIR%\output\plugins;%OSGEO4W_ROOT%\apps\qt5\plugins

cmake --build %BUILDDIR% --target Nightly --config %BUILDCONF%
cmake --build %BUILDDIR% --target NightlyTest --config %BUILDCONF%
if errorlevel 1 echo TESTS WERE NOT SUCCESSFUL.
cmake --build %BUILDDIR% --target NightlySubmit --config %BUILDCONF%
if errorlevel 1 echo TEST SUBMISSION WAS NOT SUCCESSFUL.

set TEMP=%oldtemp%
set TMP=%oldtmp%

0 comments on commit 792c19b

Please sign in to comment.
You can’t perform that action at this time.