You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/09/29 11:42:54 UTC
[1/2] brooklyn-dist git commit: Fix release scripts
Repository: brooklyn-dist
Updated Branches:
refs/heads/master 6df4fe1f9 -> 4a64f33b6
Fix release scripts
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/4fb66438
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/4fb66438
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/4fb66438
Branch: refs/heads/master
Commit: 4fb66438bbe1940e255959bdf0d9152ce9f3124e
Parents: 4b555fc
Author: Duncan Godwin <du...@cloudsoftcorp.com>
Authored: Wed Sep 20 22:09:22 2017 +0100
Committer: Duncan Godwin <du...@cloudsoftcorp.com>
Committed: Wed Sep 20 22:09:22 2017 +0100
----------------------------------------------------------------------
release/Vagrantfile | 8 +++++---
release/make-release-artifacts.sh | 29 ++++++++++++++++++++---------
2 files changed, 25 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/4fb66438/release/Vagrantfile
----------------------------------------------------------------------
diff --git a/release/Vagrantfile b/release/Vagrantfile
index 71a9a24..21c21fe 100644
--- a/release/Vagrantfile
+++ b/release/Vagrantfile
@@ -60,8 +60,10 @@ Vagrant.configure(2) do |config|
config.vm.provision "file", source: "~/.gitconfig", destination: ".gitconfig"
config.vm.provision "file", source: "~/.gnupg/gpg.conf", destination: ".gnupg/gpg.conf"
- config.vm.provision "file", source: "~/.gnupg/pubring.gpg", destination: ".gnupg/pubring.gpg"
- config.vm.provision "file", source: "~/.gnupg/secring.gpg", destination: ".gnupg/secring.gpg"
+
+ # Uncomment these lines if you would like to include your local gnupg keys
+ #config.vm.provision "file", source: "~/.gnupg/pubring.gpg", destination: ".gnupg/pubring.gpg"
+ #config.vm.provision "file", source: "~/.gnupg/secring.gpg", destination: ".gnupg/secring.gpg"
config.vm.provision "file", source: "gpg-agent.conf", destination: ".gnupg/gpg-agent.conf"
config.vm.provision "file", source: "settings.xml", destination: ".m2/settings.xml"
@@ -76,7 +78,7 @@ Vagrant.configure(2) do |config|
apt-get install -y default-jdk git subversion xmlstarlet zip unzip language-pack-en \
vim-nox gnupg2 gnupg-agent pinentry-curses golang rpm mmv haveged
mkdir -p /opt
- MAVEN_VERSION=3.3.39
+ MAVEN_VERSION=3.3.3
curl http://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz | tar xz -C /opt
ln -s /opt/apache-maven-${MAVEN_VERSION}/bin/mvn /usr/local/bin
mkdir -p /work
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/4fb66438/release/make-release-artifacts.sh
----------------------------------------------------------------------
diff --git a/release/make-release-artifacts.sh b/release/make-release-artifacts.sh
index f6b1d17..9f804ee 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -226,14 +226,20 @@ set +x
echo "Make CLI artifacts"
set -x
+# copy in each of the br tools
+mkdir ${bin_staging_dir}/${release_name}-client-cli-linux
+mkdir ${bin_staging_dir}/${release_name}-client-cli-windows
+mkdir ${bin_staging_dir}/${release_name}-client-cli-macosx
+cp ${src_staging_dir}/brooklyn-client/cli/target/bin/linux.386/br ${bin_staging_dir}/${release_name}-client-cli-linux
+cp ${src_staging_dir}/brooklyn-client/cli/target/bin/windows.386/br.exe ${bin_staging_dir}/${release_name}-client-cli-windows
+cp ${src_staging_dir}/brooklyn-client/cli/target/bin/darwin.amd64/br ${bin_staging_dir}/${release_name}-client-cli-macosx
+
+# copy in the LICENSE, README and NOTICE
for p in linux windows macosx; do
- mkdir ${bin_staging_dir}/${release_name}-client-cli-${p}
- rsync -a ${bin_staging_dir}/${release_name}-bin/bin/brooklyn-client-cli/ ${bin_staging_dir}/${release_name}-client-cli-${p} --exclude '*.386' --exclude '*.amd64'
-done
-cp ${bin_staging_dir}/${release_name}-bin/bin/brooklyn-client-cli/linux.386/br ${bin_staging_dir}/${release_name}-client-cli-linux
-cp ${bin_staging_dir}/${release_name}-bin/bin/brooklyn-client-cli/windows.386/br.exe ${bin_staging_dir}/${release_name}-client-cli-windows
-cp ${bin_staging_dir}/${release_name}-bin/bin/brooklyn-client-cli/darwin.amd64/br ${bin_staging_dir}/${release_name}-client-cli-macosx
-for p in linux windows macosx; do
+ cp ${src_staging_dir}/brooklyn-client/cli/release/files/README ${bin_staging_dir}/${release_name}-client-cli-${p}
+ cp ${src_staging_dir}/LICENSE ${bin_staging_dir}/${release_name}-client-cli-${p}
+ cp ${src_staging_dir}/NOTICE ${bin_staging_dir}/${release_name}-client-cli-${p}
+
( cd ${bin_staging_dir} && tar czf ${artifact_dir}/${artifact_name}-client-cli-${p}.tar.gz ${release_name}-client-cli-${p} )
( cd ${bin_staging_dir} && zip -qr ${artifact_dir}/${artifact_name}-client-cli-${p}.zip ${release_name}-client-cli-${p} )
done
@@ -254,7 +260,12 @@ mv ${bin_staging_dir}/brooklyn-vagrant-${current_version} ${bin_staging_dir}/${r
###############################################################################
# RPM artifacts
-cp ${src_staging_dir}/brooklyn-dist/rpm-packaging/target/rpm/apache-brooklyn/RPMS/noarch/apache-brooklyn-${current_version}-1.noarch.rpm ${artifact_dir}/${artifact_name}-1.noarch.rpm
+cp ${src_staging_dir}/brooklyn-dist/rpm-packaging/target/rpm/apache-brooklyn-noarch/RPMS/noarch/apache-brooklyn-${current_version}-1.noarch.rpm ${artifact_dir}/${artifact_name}-1.noarch.rpm
+
+###############################################################################
+# deb artifacts
+
+cp ${src_staging_dir}/brooklyn-dist/deb-packaging/target/apache-brooklyn-${current_version}-all.deb ${artifact_dir}/${artifact_name}.deb
###############################################################################
# Signatures and checksums
@@ -264,7 +275,7 @@ cp ${src_staging_dir}/brooklyn-dist/rpm-packaging/target/rpm/apache-brooklyn/RPM
which sha256sum >/dev/null || alias sha256sum='shasum -a 256' && shopt -s expand_aliases
( cd ${artifact_dir} &&
- for a in *.tar.gz *.zip *.rpm; do
+ for a in *.tar.gz *.zip *.rpm *.deb; do
md5sum -b ${a} > ${a}.md5
sha1sum -b ${a} > ${a}.sha1
sha256sum -b ${a} > ${a}.sha256
[2/2] brooklyn-dist git commit: This closes #108
Posted by dr...@apache.org.
This closes #108
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/4a64f33b
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/4a64f33b
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/4a64f33b
Branch: refs/heads/master
Commit: 4a64f33b6a26781420d31404e454f52ca79b3c3d
Parents: 6df4fe1 4fb6643
Author: Duncan Godwin <dr...@googlemail.com>
Authored: Fri Sep 29 12:42:48 2017 +0100
Committer: Duncan Godwin <dr...@googlemail.com>
Committed: Fri Sep 29 12:42:48 2017 +0100
----------------------------------------------------------------------
release/Vagrantfile | 8 +++++---
release/make-release-artifacts.sh | 29 ++++++++++++++++++++---------
2 files changed, 25 insertions(+), 12 deletions(-)
----------------------------------------------------------------------