Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor tweaks to Jenkins' create installers job #3271

Merged
merged 3 commits into from
Nov 11, 2018
Merged

Minor tweaks to Jenkins' create installers job #3271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0e6834
Removed diagnostics from Debian/MacOS create installer scripts.
Nov 11, 2018
764d19c
Remember to copy files from deployment support when building on Jenkins.
Nov 11, 2018
2c81cc0
Force Jenkins' installation step to run on slaves with the 'installat…
Nov 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Jenkins/Installation/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pipeline {
parallel {
stage('Documentation') {
agent {
label "windows"
label "windows && installation"
}
environment {
APSIM_SITE_CREDS = credentials('apsim-site-creds')
Expand All @@ -32,7 +32,7 @@ pipeline {
}
stage('Windows') {
agent {
label "windows"
label "windows && installation"
}
environment {
APSIM_SITE_CREDS = credentials('apsim-site-creds')
Expand All @@ -57,7 +57,7 @@ pipeline {
}
stage('MacOS') {
agent {
label "windows"
label "windows && installation"
}
environment {
APSIM_SITE_CREDS = credentials('apsim-site-creds')
Expand All @@ -82,7 +82,7 @@ pipeline {
}
stage('Debian') {
agent {
label "windows"
label "windows && installation"
}
environment {
APSIM_SITE_CREDS = credentials('apsim-site-creds')
Expand All @@ -109,7 +109,7 @@ pipeline {
}
stage('Deploy') {
agent {
label "windows"
label "windows && installation"
}
environment {
CHANGE_DB_CREDS = credentials('change-db-creds')
Expand Down
2 changes: 1 addition & 1 deletion Jenkins/UploadDocumentation.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 6 additions & 0 deletions Jenkins/build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Setup/Linux/BuildDeb.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Setup/osx/BuildMacDist.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@echo on
@echo off
setlocal enabledelayedexpansion
if "%apsimx%"=="" (
pushd %~dp0..\..>nul
Expand Down