This is an automated email from the ASF dual-hosted git repository.
alexpl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-release.git
commit a1da3704056a7ca6d42152dafbed5402634bdfd4
Author: Aleksey Plekhanov <plehanov.a...@gmail.com>
AuthorDate: Thu Oct 22 16:33:33 2020 +0300
Fixed issue with rpm/deb packages directories
---
scripts/vote_3_step_1[packages][optional]build.sh | 21 +++++++++++----------
scripts/vote_3_step_3[svn]deploy_artifacts.sh | 2 +-
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/scripts/vote_3_step_1[packages][optional]build.sh
b/scripts/vote_3_step_1[packages][optional]build.sh
index e965bf9..22a893d 100644
--- a/scripts/vote_3_step_1[packages][optional]build.sh
+++ b/scripts/vote_3_step_1[packages][optional]build.sh
@@ -23,25 +23,26 @@ 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
+mkdir packages
+cp -rfv git/packaging/* ./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 f2c2f73..dbc60ec 100644
--- a/scripts/vote_3_step_3[svn]deploy_artifacts.sh
+++ b/scripts/vote_3_step_3[svn]deploy_artifacts.sh
@@ -15,7 +15,7 @@ echo "RC ${ignite_version}${rc_name}"
#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 packages
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"
#
