Skip to content

Update Jenkins deployment to include readme files from Andys script. #414

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update Jenkins deployment to include readme files from Andys script. #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions tools/jenkins/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,11 @@ pipeline {
GITDOCURL = 'documentation'

SVNDOCURL = "docbin/trunk/documentation"
SVNREADMEURL = "dyalog/branches/20.0/svn/docs/readmes"
SVNSHARPPLOTURL = "dyalogtools/Causeway/trunk/release"

SVNDOCDIR = 'svn_docs'
GITDOCDIR = 'git_docs'
SVNDOCDIR = 'svn_docs'
GITDOCDIR = 'git_docs'
}

stages {
Expand Down Expand Up @@ -113,14 +114,15 @@ pipeline {
}
}

stage('Get files from svn/docbin') {
stage('Get files from svn/docbin etc') {
steps {
dir("${env.DOCSVERSION}/files") { // Remove files directory to ensure we start with a clean sheet
deleteDir()
}
dir("${env.DOCSVERSION}") {
doSvnCheckout(SVNDOCURL, "files", true, 'svncom')
doSvnCheckout(SVNSHARPPLOTURL, "files/sharpplot", true, 'svncom')
doSvnCheckout(SVNREADMEURL, "files/readmes")
sh '''$WORKSPACE/get_svn_docbin ${DOCSVERSION}'''
}
}
Expand Down
19 changes: 14 additions & 5 deletions tools/jenkins/get_svn_docbin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ Exit ()
FILESDIR="files"
SHARPPLOTDIR="./sharpplot" # Relative to $FILESDIR
SHARPPLOTCHM="sharpplot.chm"
READMEDIR="./readmes"
SETUPREADME="setup_readme.htm"
DYALOGREADME="dyalog_readme.htm"
FILELISTFILE="./filelist.txt"

TMPFILE="$(basename $0).$$"
Expand All @@ -37,17 +40,23 @@ TMPFILELIST="$TMPFILE.filelist.$$"
[ $# -ne 1 ] && Exit 1 "Usage: $0 version"
VERSION=$1

# 1. move sharplot.chm up one level and delete .svn and sharpplot directories
echo "Move sharpplot.chm up one level and remove .svn and sharpplot directories .."
# 1. move sharplot.chm up one level and delete .svn, readmes and sharpplot directories
echo "Move sharplot.chm, setup_readme and dyalog_readme up one level and delete .svn, readmes and sharpplot directories .."
cd $FILESDIR || Exit 2 "Unable to cd to $FILESDIR after exporting from svn"
[ ! -f $SHARPPLOTDIR/$SHARPPLOTCHM ] && Exit 2 "No $SHARPPLOTDIR/$SHARPPLOTCHM file exists; bailing"
[ ! -f $READMEDIR/$SETUPREADME ] && Exit 2 "No $READMEDIR/$SETUPREADME file exists; bailing"
[ ! -f $READMEDIR/$DYALOGREADME ] && Exit 2 "No $READMEDIR/$DYALOGREADME file exists; bailing"
[ ! -f $FILELISTFILE ] && Exit 2 "No $FILELISTFILE; bailing"
mv $SHARPPLOTDIR/$SHARPPLOTCHM .
rm -rf .svn $SHARPPLOTDIR
mv $SHARPPLOTDIR/$SHARPPLOTCHM $READMEDIR/$SETUPREADME $READMEDIR/$DYALOGREADME.
rm -rf .svn $SHARPPLOTDIR $READMEDIR

# 2. Sanity check: all files in the file list should be present
echo "Check that all files in filelist are present .."
echo "./$SHARPPLOTCHM\tweb" >>$FILELISTFILE # a bit of a kludge, but simplifies things below
# We have to cope with $SHARPPLOTCHM, $SETUPREADME and $DYALOGREADME. The simplest way is to add them to
# $FILELISTFILE at this point ..
echo "./$SHARPPLOTCHM\tweb" >>$FILELISTFILE
echo "./$SETUPREADME\tweb" >>$FILELISTFILE
echo "./$DYALOGREADME\tweb" >>$FILELISTFILE
egrep -v "^#|^$|^[ ]*$" $FILELISTFILE >$TMPFILE && mv $TMPFILE $FILELISTFILE
[ 0 -eq $(wc -l $FILELISTFILE | awk '{print $1}') ] && Exit 2 "$FILELISTFILE is empty"

Expand Down