Skip to content
Permalink
Browse files

Merge pull request #100 from jenkinsci/JENKINS-44556

[JENKINS-44556] introduce a mechanism to set the debian packaging version
  • Loading branch information
kohsuke committed Jun 29, 2017
2 parents b3198e4 + 141ca57 commit 3835c07d1a1417ee684dc757455919a9150dfb06
Showing with 4 additions and 4 deletions.
  1. +2 −2 deb/build/build.sh
  2. +1 −1 deb/publish/publish.sh
  3. +1 −1 setup.mk
@@ -23,7 +23,7 @@ sed -i.bak -e 's/^\s*$/./' -e 's/^/ /' $DESCRIPTION_FILE
mv "$DESCRIPTION_FILE.bak" "$DESCRIPTION_FILE"

cat > $D/debian/changelog << EOF
${ARTIFACTNAME} ($VERSION) unstable; urgency=low
${ARTIFACTNAME} ($VERSION${DEB_REVISION}) unstable; urgency=low
* Packaged ${VERSION}
@@ -45,6 +45,6 @@ pushd $D
popd

mkdir -p "$(dirname "${DEB}")" || true
mv $D/../${ARTIFACTNAME}_${VERSION}_all.deb ${DEB}
mv $D/../${ARTIFACTNAME}_${VERSION}${DEB_REVISION}_all.deb ${DEB}

rm -rf $D
@@ -25,7 +25,7 @@ popd

# merge the result
pushd $D/binary
mvn org.kohsuke:apt-ftparchive-merge:1.4:merge -Durl="$DEB_URL/binary/" -Dout=../merged
mvn org.kohsuke:apt-ftparchive-merge:1.6:merge -Durl="$DEB_URL/binary/" -Dout=../merged
popd

cat $D/merged/Packages > $D/binary/Packages
@@ -20,7 +20,7 @@ export OSX=${TARGET}/osx/${ARTIFACTNAME}-${VERSION}.pkg
export OSX_SHASUM=${OSX}.sha256

# where to generate Debian/Ubuntu DEB file?
export DEB=${TARGET}/debian/${ARTIFACTNAME}_${VERSION}_all.deb
export DEB=${TARGET}/debian/${ARTIFACTNAME}_${VERSION}${DEB_REVISION}_all.deb

# where to generate RHEL/CentOS RPM file?
export RPM=${TARGET}/rpm/${ARTIFACTNAME}-${VERSION}-1.1.noarch.rpm

0 comments on commit 3835c07

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