diff options
| -rwxr-xr-x | bin/q | 2 | ||||
| -rwxr-xr-x | dist/create-rpm | 12 | ||||
| -rwxr-xr-x | package-release | 13 |
3 files changed, 15 insertions, 12 deletions
@@ -31,7 +31,7 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -q_version = "2.0.3" +q_version = "2.0.6" __all__ = [ 'QTextAsData' ] diff --git a/dist/create-rpm b/dist/create-rpm index 753da2d..db1a255 100755 --- a/dist/create-rpm +++ b/dist/create-rpm @@ -1,13 +1,13 @@ -#!/bin/bash +#!/bin/bash -x # # Commit tag and Version number should be provided as input in the command line # # -if [ $# -ne 1 ]; +if [ $# -ne 2 ]; then - echo 'create-rpm <version>' + echo 'create-rpm <version> <based_on_tag>' exit 1 fi @@ -27,6 +27,8 @@ mkdir -p ${rpm_build_area}/{SOURCES,SPECS,BUILD,RPMS,SRPMS,BUILDROOT} echo RPM build area is in ${rpm_build_area} VERSION=$1 +BASED_ON_TAG=$2 + REAL_PACKAGE_NAME=q RPM_PACKAGE_NAME=q-text-as-data @@ -38,12 +40,12 @@ then exit 1 fi -curl -o ${rpm_build_area}/SOURCES/q.tar.gz -L -R "https://github.com/harelba/q/tarball/${VERSION}" +curl -o ${rpm_build_area}/SOURCES/q.tar.gz -L -R "https://github.com/harelba/q/tarball/$BASED_ON_TAG" mkdir -p ${rpm_build_area}/SOURCES pushd ${rpm_build_area}/SOURCES >/dev/null tar xvzf ./q.tar.gz --strip-components=1 rm -vf ./q.tar.gz -curl -R -L -o ./bin/q "https://github.com/harelba/q/releases/download/${VERSION}/q-x86_64-Linux" +curl -o ./bin/q -L -R "https://github.com/harelba/packages-for-q/raw/master/single-binary/x86_64/${VERSION}/q" chmod +x ./bin/q popd >/dev/null find ${rpm_build_area}/ -ls diff --git a/package-release b/package-release index 3bb8197..f27186f 100755 --- a/package-release +++ b/package-release @@ -5,14 +5,15 @@ set -e base_folder=$(dirname $0) pushd ${base_folder} >/dev/null -if [ $# -ne 1 ]; +if [ $# -ne 2 ]; then - echo "Usage: $(dirname $0) <git-tag>" + echo "Usage: $(dirname $0) <version> <git-tag>" echo echo "Note that the git tag must be pushed to github before doing this." exit 1 fi -TAG="$1" +VERSION="$1" +BASED_ON_TAG="$2" d=`pwd` cid1=`docker run -i -d -v ${d}:/q q-text-as-data-rpm-builder:0.1` @@ -27,9 +28,9 @@ rm -rvf ${base_folder}/packages mkdir -p ${base_folder}/packages sleep 1 -docker exec -it ${cid1} /bin/bash -i -c "/q/dist/create-rpm ${TAG}" +docker exec -it ${cid1} /bin/bash -i -c "/q/dist/create-rpm ${VERSION} ${BASED_ON_TAG}" -docker cp ${cid1}:/q/dist/rpm_build_area/RPMS/x86_64/q-text-as-data-${TAG}-1.el6.x86_64.rpm ${base_folder}/packages/q-text-as-data-${TAG}-1.x86_64.rpm +docker cp ${cid1}:/q/dist/rpm_build_area/RPMS/x86_64/q-text-as-data-${VERSION}-1.el6.x86_64.rpm ${base_folder}/packages/q-text-as-data-${VERSION}-1.x86_64.rpm -docker exec -it ${cid2} /bin/bash -i -c "cd /q/packages && alien ./q-text-as-data-${TAG}-1.x86_64.rpm" +docker exec -it ${cid2} /bin/bash -i -c "cd /q/packages && alien ./q-text-as-data-${VERSION}-1.x86_64.rpm" |