From 6e5f4f36166c5a29759f4f78abeab6e9b579e2aa Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Tue, 9 Mar 2021 22:10:44 +0100 Subject: [PATCH] nightlies: fix pushing to dash --- debian/rules | 1 + ms-windows/osgeo4w/package-nightly.cmd | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules index 52739be0907..6d97c319dba 100755 --- a/debian/rules +++ b/debian/rules @@ -256,6 +256,7 @@ test-stamp: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) # Code to run the package test suite rm -f $(QGIS_BUILDDIR)/.error + cp -u $(QGIS_BUILDDIR)/CTestConfig.cmake . mkdir -p debian/tmp/locale/ localedef -f UTF-8 -i en_US ./debian/tmp/locale/en_US.UTF-8/ LOCPATH=$(CURDIR)/debian/tmp/locale/ \ diff --git a/ms-windows/osgeo4w/package-nightly.cmd b/ms-windows/osgeo4w/package-nightly.cmd index bcafe08d8c4..4c27097e541 100644 --- a/ms-windows/osgeo4w/package-nightly.cmd +++ b/ms-windows/osgeo4w/package-nightly.cmd @@ -160,6 +160,8 @@ if errorlevel 1 (echo cmake failed & goto error) if "%CONFIGONLY%"=="1" (echo Exiting after configuring build directory: %CD% & goto end) +copy %BUILDDIR%\CTestConfig.cmake %SRCDIR% + :skipcmake if exist ..\noclean (echo skip clean & goto skipclean) echo CLEAN: %DATE% %TIME%