From d0e6834005650749e41ca796686a4ba9a341b941 Mon Sep 17 00:00:00 2001 From: "NEXUS\\hol430" Date: Mon, 12 Nov 2018 07:47:07 +1000 Subject: [PATCH 1/3] Removed diagnostics from Debian/MacOS create installer scripts. --- Jenkins/UploadDocumentation.bat | 2 +- Setup/Linux/BuildDeb.bat | 2 +- Setup/osx/BuildMacDist.bat | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkins/UploadDocumentation.bat b/Jenkins/UploadDocumentation.bat index 2d655d2f83..a3626aef27 100644 --- a/Jenkins/UploadDocumentation.bat +++ b/Jenkins/UploadDocumentation.bat @@ -17,6 +17,6 @@ for /r %apsimx%\Documentation\PDF %%D in (*.pdf) do ( rename "%%D" "!NEW_NAME!" set "FILE=%%~dpD!NEW_NAME!" echo Uploading "!FILE!" - @curl -u !APSIM_SITE_CREDS! -T !FILE! ftp://www.apsim.info/APSIM/ApsimXFiles/ + @curl -s -u !APSIM_SITE_CREDS! -T !FILE! ftp://www.apsim.info/APSIM/ApsimXFiles/ ) endlocal \ No newline at end of file diff --git a/Setup/Linux/BuildDeb.bat b/Setup/Linux/BuildDeb.bat index 804aa82899..f13ea07fe4 100644 --- a/Setup/Linux/BuildDeb.bat +++ b/Setup/Linux/BuildDeb.bat @@ -1,4 +1,4 @@ -@echo on +@echo off set "PATH=%PATH%;C:\Utilities" if Exist Apsim.deb Del Apsim.deb rem Get the current version number diff --git a/Setup/osx/BuildMacDist.bat b/Setup/osx/BuildMacDist.bat index 5441c98940..31400b408c 100644 --- a/Setup/osx/BuildMacDist.bat +++ b/Setup/osx/BuildMacDist.bat @@ -1,4 +1,4 @@ -@echo on +@echo off setlocal enabledelayedexpansion if "%apsimx%"=="" ( pushd %~dp0..\..>nul From 764d19c33da2253c442dc0c283877ad271b5c43d Mon Sep 17 00:00:00 2001 From: "NEXUS\\hol430" Date: Mon, 12 Nov 2018 07:59:56 +1000 Subject: [PATCH 2/3] Remember to copy files from deployment support when building on Jenkins. --- Jenkins/build.bat | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Jenkins/build.bat b/Jenkins/build.bat index 73d0822b03..1878a41e07 100644 --- a/Jenkins/build.bat +++ b/Jenkins/build.bat @@ -38,6 +38,12 @@ if not exist "%solution_file%" ( exit /b 1 ) +rem Copy DeploymentSupport files. +echo Copying DeploymentSupport files... +xcopy /e /i %apsimx%\DeploymentSupport\Windows\Bin64\lib %apsimx%\lib>nul +copy /y %apsimx%\DeploymentSupport\Windows\Bin64\* %apsimx%\Bin>nul +echo Done. + rem Restore NuGet packages. echo Restoring NuGet packages... pushd "%apsimx%">nul From 2c81cc026686e105a391cfdeb09d821799563e70 Mon Sep 17 00:00:00 2001 From: "NEXUS\\hol430" Date: Mon, 12 Nov 2018 08:02:33 +1000 Subject: [PATCH 3/3] Force Jenkins' installation step to run on slaves with the 'installation' tag. --- Jenkins/Installation/Jenkinsfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkins/Installation/Jenkinsfile b/Jenkins/Installation/Jenkinsfile index 18ac6b7fcc..336938e31f 100644 --- a/Jenkins/Installation/Jenkinsfile +++ b/Jenkins/Installation/Jenkinsfile @@ -5,7 +5,7 @@ pipeline { parallel { stage('Documentation') { agent { - label "windows" + label "windows && installation" } environment { APSIM_SITE_CREDS = credentials('apsim-site-creds') @@ -32,7 +32,7 @@ pipeline { } stage('Windows') { agent { - label "windows" + label "windows && installation" } environment { APSIM_SITE_CREDS = credentials('apsim-site-creds') @@ -57,7 +57,7 @@ pipeline { } stage('MacOS') { agent { - label "windows" + label "windows && installation" } environment { APSIM_SITE_CREDS = credentials('apsim-site-creds') @@ -82,7 +82,7 @@ pipeline { } stage('Debian') { agent { - label "windows" + label "windows && installation" } environment { APSIM_SITE_CREDS = credentials('apsim-site-creds') @@ -109,7 +109,7 @@ pipeline { } stage('Deploy') { agent { - label "windows" + label "windows && installation" } environment { CHANGE_DB_CREDS = credentials('change-db-creds')