Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 6 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -194,13 +194,17 @@ pipeline {
stage("${OS} Release") {
sh "./deploy/build.sh --os=${OS} --release=${new_version}"

findFiles(glob: "tarfiles/*.tgz").each {
findFiles(glob: "packages/*.tgz").each {
file -> release_file_list.add(WORKSPACE + "/" + file.path)
}

findFiles(glob: "packages/*.exe").each {
file -> release_file_list.add(WORKSPACE + "/" + file.path)
}
}

stage("${OS} Publish") {
sh "./deploy/build.sh --os=${OS} --publish=${new_version} --publishdir=/tmp/publish"
sh "./deploy/build.sh --os=${OS} --publish=${new_version} --keys=/mdsplus/certs --publishdir=/tmp/publish"
}
}
}
Expand Down
5 changes: 5 additions & 0 deletions deploy/packaging/windows/create_installer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,8 @@ if [ -d /sign_keys ]; then
echo "Failed to sign installer"
fi
fi

PACKAGESDIR=/workspace/packages
rm -Rf ${PACKAGESDIR}
mkdir -p $PACKAGESDIR
cp /release/${FLAVOR}/*.exe $PACKAGESDIR/
10 changes: 5 additions & 5 deletions deploy/platform/debian/debian_docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ buildrelease() {
# ${RELEASEDIR}/${FLAVOR}/DEBS will be cleaned in debian_build.sh
RELEASEDEBS=/release/${FLAVOR}/DEBS/${ARCH}
RELEASEBLD=/workspace/releasebld
TARFILES=/workspace/tarfiles
PACKAGESDIR=/workspace/packages
BUILDROOT=${RELEASEBLD}/buildroot
MDSPLUS_DIR=${BUILDROOT}/usr/local/mdsplus
rm -Rf ${RELEASEBLD}/${bits} ${BUILDROOT} ${TARFILES}
mkdir -p ${RELEASEBLD}/${bits} ${BUILDROOT} ${MDSPLUS_DIR} ${TARFILES}
rm -Rf ${RELEASEBLD}/${bits} ${BUILDROOT} ${PACKAGESDIR}
mkdir -p ${RELEASEBLD}/${bits} ${BUILDROOT} ${MDSPLUS_DIR} ${PACKAGESDIR}
pushd ${RELEASEBLD}/${bits}
config ${config_param} ${CONFIGURE_EXTRA}
if [ -z "$NOMAKE" ]; then
Expand Down Expand Up @@ -155,11 +155,11 @@ EOF
popd

pushd ${MDSPLUS_DIR}
tar -czf $TARFILES/mdsplus_${FLAVOR}_${RELEASE_VERSION}_${OS}_${ARCH}.tgz *
tar -czf $PACKAGESDIR/mdsplus_${FLAVOR}_${RELEASE_VERSION}_${OS}_${ARCH}.tgz *
popd

pushd ${RELEASEDEBS}
tar -czf $TARFILES/mdsplus_${FLAVOR}_${RELEASE_VERSION}_${OS}_${ARCH}_debs.tgz *.deb
tar -czf $PACKAGESDIR/mdsplus_${FLAVOR}_${RELEASE_VERSION}_${OS}_${ARCH}_debs.tgz *.deb
popd
fi #abort
fi #nomake
Expand Down
10 changes: 5 additions & 5 deletions deploy/platform/redhat/redhat_docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ buildrelease() {
set -e
RELEASEBLD=/workspace/releasebld
BUILDROOT=${RELEASEBLD}/buildroot
TARFILES=/workspace/tarfiles
PACKAGESDIR=/workspace/packages
MDSPLUS_DIR=${BUILDROOT}/usr/local/mdsplus
rm -Rf ${RELEASEBLD} /release/${FLAVOR} ${TARFILES}
mkdir -p ${RELEASEBLD}/64 ${BUILDROOT} ${MDSPLUS_DIR} ${TARFILES}
rm -Rf ${RELEASEBLD} /release/${FLAVOR} ${PACKAGESDIR}
mkdir -p ${RELEASEBLD}/64 ${BUILDROOT} ${MDSPLUS_DIR} ${PACKAGESDIR}
pushd ${RELEASEBLD}/64
config ${test64} ${CONFIGURE_EXTRA}
if [ -z "$NOMAKE" ]; then
Expand Down Expand Up @@ -135,11 +135,11 @@ EOF
checkstatus abort "Failure: Problem with contents of one or more rpms. (see above)" $badrpm

pushd ${MDSPLUS_DIR}
tar -czf $TARFILES/mdsplus_${FLAVOR}_${RELEASE_VERSION}_${OS}_${ARCH}.tgz *
tar -czf $PACKAGESDIR/mdsplus_${FLAVOR}_${RELEASE_VERSION}_${OS}_${ARCH}.tgz *
popd

pushd /release/${FLAVOR}/RPMS
tar -czf $TARFILES/mdsplus_${FLAVOR}_${RELEASE_VERSION}_${OS}_${ARCH}_rpms.tgz */*.rpm
tar -czf $PACKAGESDIR/mdsplus_${FLAVOR}_${RELEASE_VERSION}_${OS}_${ARCH}_rpms.tgz */*.rpm
popd
fi #nomake
}
Expand Down