You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2019/08/20 13:15:32 UTC
[ignite-release] branch master updated: IGNITE-12083: Change
release scripts according pre-build DEB/RPM folders (#5)
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-release.git
The following commit(s) were added to refs/heads/master by this push:
new 34461fc IGNITE-12083: Change release scripts according pre-build DEB/RPM folders (#5)
34461fc is described below
commit 34461fc273726209c0f274b35056fb02d6906386
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Tue Aug 20 16:15:27 2019 +0300
IGNITE-12083: Change release scripts according pre-build DEB/RPM folders (#5)
---
scripts/release_2[bintray]upload_packages.sh | 4 ++--
....sh => vote_3_step_1[packages][optional]build.sh} | 20 ++++++++++----------
scripts/vote_3_step_3[svn]deploy_artifacts.sh | 3 ++-
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/scripts/release_2[bintray]upload_packages.sh b/scripts/release_2[bintray]upload_packages.sh
index 711f991..78d47c7 100644
--- a/scripts/release_2[bintray]upload_packages.sh
+++ b/scripts/release_2[bintray]upload_packages.sh
@@ -83,7 +83,7 @@ fi
# * publish
#
echo "1. Moving RPM packages to Bintray"
-cd packaging/pkg
+cd packages/pkg
for rpm in *.rpm; do
package_name=$(echo ${rpm} | \
sed -r "s|(.*)-${ignite_version}.*|\1|") # Get RPM package name
@@ -110,7 +110,7 @@ cd ${OLDPWD}
# * publish
#
echo "2. Moving DEB packages to Bintray"
-cd packaging/pkg
+cd packages/pkg
for deb in *.deb; do
package_name=$(echo ${deb} |\
cut -f1 -d_) # Get DEB package name
diff --git a/scripts/vote_3_step_1[packages]build.sh b/scripts/vote_3_step_1[packages][optional]build.sh
similarity index 58%
rename from scripts/vote_3_step_1[packages]build.sh
rename to scripts/vote_3_step_1[packages][optional]build.sh
index e965bf9..606509f 100644
--- a/scripts/vote_3_step_1[packages]build.sh
+++ b/scripts/vote_3_step_1[packages][optional]build.sh
@@ -23,25 +23,25 @@ gpg_key="$(gpg --list-keys | grep -C1 "^pub" | tail -1 | sed -r 's|^\ +||')"
#
# Build packages
#
-if [ -d packaging ]; then
- rm -rf packaging
+if [ -d packages ]; then
+ rm -rf packages
fi
-cp -rfv git/packaging ./
-cp -rfv svn/vote/apache-ignite-${ignite_version}-bin.zip packaging/
-bash packaging/package.sh --rpm
-bash packaging/package.sh --deb
+cp -rfv git/packages ./
+cp -rfv svn/vote/apache-ignite-${ignite_version}-bin.zip packages/
+bash packages/package.sh --rpm
+bash packages/package.sh --deb
#
# Sign packages
#
-rpm --define "_gpg_name ${gpg_key}" --addsign packaging/*.rpm
-dpkg-sig -k ${gpg_key} --sign builder packaging/*.deb
+rpm --define "_gpg_name ${gpg_key}" --addsign packages/*.rpm
+dpkg-sig -k ${gpg_key} --sign builder packages/*.deb
#
# Prepare SVN import directory
#
-mkdir -pv packaging/pkg
-mv -fv packaging/{*.rpm,*.deb} packaging/pkg
+mkdir -pv packages/pkg
+mv -fv packages/{*.rpm,*.deb} packages/pkg
diff --git a/scripts/vote_3_step_3[svn]deploy_artifacts.sh b/scripts/vote_3_step_3[svn]deploy_artifacts.sh
index 7f48ecd..dbc60ec 100644
--- a/scripts/vote_3_step_3[svn]deploy_artifacts.sh
+++ b/scripts/vote_3_step_3[svn]deploy_artifacts.sh
@@ -14,7 +14,8 @@ echo "RC ${ignite_version}${rc_name}"
# Uncomment subsequent line in case you want to remove incorrectly prepared RC
#svn rm -m "Removing redundant Release" https://dist.apache.org/repos/dist/dev/ignite/$ignite_version$rc_name || true
svn import svn/vote https://dist.apache.org/repos/dist/dev/ignite/$ignite_version$rc_name -m "New RC ${ignite_version}${rc_name}: Binaries"
-svn import packaging/pkg https://dist.apache.org/repos/dist/dev/ignite/packages_$ignite_version$rc_name -m "New RC ${ignite_version}${rc_name}: Packages"
+
+svn import packages/pkg https://dist.apache.org/repos/dist/dev/ignite/packages_$ignite_version$rc_name -m "New RC ${ignite_version}${rc_name}: Packages"
#