Skip to content
Permalink
Browse files

Merge pull request #90 from jenkinsci/JENKINS-41413

[JENKINS-41413] Working around jenkinsci/distfork-plugin#6
  • Loading branch information
kohsuke committed Jan 31, 2017
2 parents 4382ed8 + c7fff86 commit 1df9edbb61445632acc1109528ad09c1b6f2fda8
Showing with 3 additions and 2 deletions.
  1. +3 −2 msi/build-on-jenkins.sh
@@ -29,12 +29,13 @@ fi

case "$(uname)" in
CYGWIN*)
java -jar $TARGET/jenkins-cli.jar $CLI_SSH_ARGS dist-fork -z `cygpath --dos $D/bundle.tgz` -f ${ARTIFACTNAME}.war="${WAR}" -l "windows && packaging" -F "${MSI}=${ARTIFACTNAME}-windows.zip" \
java -jar $TARGET/jenkins-cli.jar $CLI_SSH_ARGS dist-fork -z `cygpath --dos $D/bundle.tgz` -f ${ARTIFACTNAME}.war="${WAR}" -l "windows && packaging" -F "${MSI}.tmp=${ARTIFACTNAME}-windows.zip" \
bash -ex build.sh ${ARTIFACTNAME}.war $encodedv ${ARTIFACTNAME} "${PRODUCTNAME}" ${PORT} ${CAMELARTIFACTNAME} ;;
*)
java -jar $TARGET/jenkins-cli.jar $CLI_SSH_ARGS dist-fork -z $D/bundle.tgz -f ${ARTIFACTNAME}.war="${WAR}" -l "windows && packaging" -F "${MSI}=${ARTIFACTNAME}-windows.zip" \
java -jar $TARGET/jenkins-cli.jar $CLI_SSH_ARGS dist-fork -z $D/bundle.tgz -f ${ARTIFACTNAME}.war="${WAR}" -l "windows && packaging" -F "${MSI}.tmp=${ARTIFACTNAME}-windows.zip" \
bash -ex build.sh ${ARTIFACTNAME}.war $encodedv ${ARTIFACTNAME} "${PRODUCTNAME}" ${PORT} ${CAMELARTIFACTNAME} ;;
esac

mv ${MSI}.tmp ${MSI}
touch ${MSI}
rm -rf $D

0 comments on commit 1df9edb

Please sign in to comment.
You can’t perform that action at this time.