Skip to content

Commit

Permalink
Merge pull request #3419 from Rohja/fix-build-number-deb-rpm
Browse files Browse the repository at this point in the history
Fix build number deb rpm
  • Loading branch information
Unitech authored Jan 23, 2018
2 parents 1960169 + 5fe8cc8 commit b4343de
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ pipeline:
image: keymetrics/alpine-pm2-builder:latest
environment:
- AWS_REPO_BUCKET=alpine-apk.pm2.io
- PM2_TARGET_VERSION=2.7.2
secrets: ['apk_rsa_priv_key', 'apk_rsa_pub_key', 'aws_access_key_id', 'aws_secret_access_key']
when:
event: tag
4 changes: 2 additions & 2 deletions packager/build-deb-rpm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ echo "Cleaning PACKAGE_TMPDIR..."
rm -rf $PACKAGE_TMPDIR

PM2_VERSION=`node dist/bin/pm2 --version`
VERSION=$PM2_VERSION"-"$DRONE_BUILD_NUMBER
VERSION=$PM2_VERSION
TARBALL_NAME=dist/pm2-v$PM2_VERSION.tar.gz
OUTPUT_DIR=artifacts

Expand Down Expand Up @@ -121,7 +121,7 @@ fpm --input-type dir --chdir $PACKAGE_TMPDIR \
--description '$(cat packager/debian/description)' \
--vendor 'Keymetrics <[email protected]>' \
--maintainer 'Alexandre Strzelewicz <[email protected]>' \
--version $PM2_VERSION --iteration $DRONE_BUILD_NUMBER \
--version $PM2_VERSION \
--after-install packager/rhel/postinst \
--before-remove packager/rhel/prerm \
--after-remove packager/rhel/postrm \
Expand Down
2 changes: 1 addition & 1 deletion packager/publish_deb_rpm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

REPOSITORY_NAME="keymetrics/pm2"

for OSDIST in 'ubuntu/xenial' 'ubuntu/yakkety' 'ubuntu/zesty' 'ubuntu/artful' 'debian/wheezy' 'debian/jessie' 'debian/stretch' 'debian/buster' 'raspbian/wheezy' 'raspbian/jessie' 'raspbian/stretch' 'raspbian/buster'
for OSDIST in 'ubuntu/trusty' 'ubuntu/xenial' 'ubuntu/yakkety' 'ubuntu/zesty' 'ubuntu/artful' 'debian/wheezy' 'debian/jessie' 'debian/stretch' 'debian/buster' 'raspbian/wheezy' 'raspbian/jessie' 'raspbian/stretch' 'raspbian/buster'
do
package_cloud push $REPOSITORY_NAME/$OSDIST `find -name "*.deb"`
done
Expand Down

0 comments on commit b4343de

Please sign in to comment.