Skip to content

Commit fe27603

Browse files
rafierafie
committed
pack.sh fixes
1 parent 4429ae3 commit fe27603

File tree

3 files changed

+65
-38
lines changed

3 files changed

+65
-38
lines changed

‎.circleci/config.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ commands:
3232
chown `whoami` ~/workspace
3333
- run:
3434
name: Build
35-
command: make -C opt all SHOW=1
35+
command: |
36+
make -C opt all SHOW=1
37+
# make -C opt pack SHOW=1
38+
make -C opt pack BRANCH="${CIRCLE_BRANCH//[^A-Za-z0-9._-]/_}" INTO=~/workspace/packages SHOW=1
3639
- run:
3740
name: Test
3841
command: |

‎opt/pack.sh‎

Lines changed: 57 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ HERE="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
1212
. $HERE/readies/shibumi/functions
1313
ROOT=$(realpath $HERE/..)
1414

15-
RAMP_PROG=ramp
15+
RAMP_PROG="python3 -m RAMP.ramp"
1616
REDIS_ENT_LIB_PATH=/opt/redislabs/lib
1717

1818
BINDIR=$(realpath $BINDIR)
@@ -21,30 +21,38 @@ INSTALL_DIR=$(realpath $INSTALL_DIR)
2121
export LC_ALL=C.UTF-8
2222
export LANG=C.UTF-8
2323

24+
export ARCH=$($ROOT/opt/readies/bin/platform --arch)
25+
export OS=$($ROOT/opt/readies/bin/platform --os)
26+
export OSNICK=$($ROOT/opt/readies/bin/platform --osnick)
27+
2428
pack_ramp() {
2529
echo "Building RAMP file ..."
2630
cd $ROOT
31+
32+
local STEM=$PRODUCT.$OS-$OSNICK-$ARCH
33+
local FQ_VER=$GIT_VER
34+
local FQ_PACKAGE=$STEM.$FQ_VER
35+
36+
# this is only to extract {semantic_version} into VERSION
2737
RAMPOUT=$(mktemp /tmp/ramp.XXXXXX)
2838
$RAMP_PROG pack -m $ROOT/ramp.yml -o $BINDIR/$PRODUCT.{os}-{architecture}.{semantic_version}.zip $INSTALL_DIR/$PRODUCT.so 2> /dev/null | grep '.zip' > $RAMPOUT
29-
realpath $(tail -1 $RAMPOUT) > $BINDIR/PACKAGE
30-
cat $BINDIR/PACKAGE | sed -e "s/[^.]*\.[^.]*\.\(.*\)\.zip/\1/" > $BINDIR/VERSION
31-
cat $BINDIR/PACKAGE | sed -e "s/[^.]*\.\([^.]*\)\..*\.zip/\1/" > $BINDIR/OSARCH
32-
PACKAGE=$(cat $BINDIR/PACKAGE)
33-
VERSION=$(cat $BINDIR/VERSION)
34-
OSARCH=$(cat $BINDIR/OSARCH)
35-
$RAMP_PROG pack -m $ROOT/ramp.yml -o "$BINDIR/$PRODUCT.{os}-{architecture}.{semantic_version}.zip" \
36-
-c "BACKENDSPATH $REDIS_ENT_LIB_PATH/$PRODUCT-$DEVICE-$VERSION/backends" $INSTALL_DIR/$PRODUCT.so 2> /dev/null | grep '.zip' > $RAMPOUT
37-
rm -f $RAMPOUT
38-
export PACK_FNAME="$(basename $PACKAGE)"
39+
echo "RAMPOUT=`cat $RAMPOUT`"
40+
local rampfile=`realpath $(tail -1 $RAMPOUT)`
41+
rm -f $rampfile $RAMPOUT
42+
echo `basename $rampfile` | sed -e "s/[^.]*\.[^.]*\.\(.*\)\.zip/\1/" > $BINDIR/VERSION
43+
export VERSION=$(cat $BINDIR/VERSION)
44+
45+
$RAMP_PROG pack -m $ROOT/ramp.yml -o $BINDIR/$FQ_PACKAGE.zip \
46+
-c "BACKENDSPATH $REDIS_ENT_LIB_PATH/$PRODUCT-$DEVICE-$VERSION/backends" $INSTALL_DIR/$PRODUCT.so > /dev/null 2>&1
3947

4048
cd "$BINDIR"
41-
RAMP_STEM=$PRODUCT.$OSARCH
42-
ln -sf $PACK_FNAME $RAMP_STEM.latest.zip
43-
[[ ! -z $BRANCH ]] && ln -sf $PACK_FNAME $RAMP_STEM.${BRANCH}.zip
44-
ln -sf $PACK_FNAME $RAMP_STEM.${GIT_VER}.zip
49+
ln -sf $FQ_PACKAGE.zip $STEM.$VERSION.zip
50+
ln -sf $FQ_PACKAGE.zip $STEM.latest.zip
51+
# [[ ! -z $BRANCH ]] && ln -sf $FQ_PACKAGE.zip $STEM.$BRANCH.zip
4552

46-
export RELEASE_ARTIFACTS="$RELEASE_ARTIFACTS $PACK_FNAME $RAMP_STEM.latest.zip"
47-
export DEV_ARTIFACTS="$DEV_ARTIFACTS $RAMP_STEM.${BRANCH}.zip $RAMP_STEM.${GIT_VER}.zip"
53+
export RELEASE_ARTIFACTS="$RELEASE_ARTIFACTS $STEM.$VERSION.zip $RAMP_STEM.latest.zip"
54+
export DEV_ARTIFACTS="$DEV_ARTIFACTS $FQ_PACKAGE.zip $STEM.$BRANCH.zip"
55+
# [[ ! -z $BRANCH ]] && export DEV_ARTIFACTS="$DEV_ARTIFACTS $DEPS.$BRANCH.tgz"
4856

4957
echo "Done."
5058
}
@@ -53,32 +61,37 @@ pack_deps() {
5361
echo "Building dependencies file ..."
5462

5563
cd $ROOT
56-
PACK_FNAME=$(basename `cat $BINDIR/PACKAGE`)
57-
ARCHOSVER=$(echo "$PACK_FNAME" | sed -e "s/^[^.]*\.\([^.]*\..*\)\.zip/\1/")
64+
5865
VERSION=$(cat $BINDIR/VERSION)
66+
local VARIANT=$OS-$OSNICK-$ARCH.$GIT_VER
67+
68+
local STEM=$PRODUCT-$DEVICE-dependencies.$OS-$OSNICK-$ARCH
69+
local FQ_VER=$GIT_VER
70+
local FQ_PACKAGE=$STEM.$FQ_VER
71+
5972
cd $INSTALL_DIR
73+
local BACKENDS_DIR=$PRODUCT-$DEVICE-$VERSION
6074
if [[ ! -h backends ]]; then
6175
[[ ! -d backends ]] && { echo "install-$DEVICE/backend directory not found." ; exit 1; }
62-
rm -rf $PRODUCT-$DEVICE-$VERSION
63-
mkdir $PRODUCT-$DEVICE-$VERSION
76+
rm -rf $BACKENDS_DIR
77+
mkdir $BACKENDS_DIR
6478

65-
mv backends $PRODUCT-$DEVICE-$VERSION
66-
ln -s $PRODUCT-$DEVICE-$VERSION/backends backends
79+
mv backends $BACKENDS_DIR
80+
ln -s $BACKENDS_DIR/backends backends
6781
fi
68-
find $PRODUCT-$DEVICE-$VERSION -name "*.so*" | xargs tar pczf $BINDIR/$PRODUCT-$DEVICE-dependencies.$ARCHOSVER.tgz
69-
export DEPS_FNAME="$PRODUCT-$DEVICE-dependencies.$ARCHOSVER.tgz"
82+
find $BACKENDS_DIR -name "*.so*" | xargs tar pczf $BINDIR/$FQ_PACKAGE.tgz
7083

7184
cd "$BINDIR"
72-
DEPS_STEM=$PRODUCT-$DEVICE-dependencies.$OSARCH
73-
ln -sf $DEPS_FNAME $DEPS_STEM.latest.tgz
74-
[[ ! -z $BRANCH ]] && ln -sf $DEPS_FNAME $DEPS_STEM.${BRANCH}.tgz
75-
ln -sf $DEPS_FNAME $DEPS_STEM.${GIT_VER}.tgz
85+
ln -sf $FQ_PACKAGE.tgz $STEM.$VERSION.tgz
86+
ln -sf $FQ_PACKAGE.tgz $STEM.latest.tgz
87+
# [[ ! -z $BRANCH ]] && ln -sf $FQ_PACKAGE.tgz $STEM.$BRANCH.tgz
7688

77-
export RELEASE_ARTIFACTS="$RELEASE_ARTIFACTS $DEPS_FNAME $DEPS_STEM.latest.tgz"
78-
export DEV_ARTIFACTS="$DEV_ARTIFACTS $DEPS_STEM.${BRANCH}.tgz $DEPS_STEM.${GIT_VER}.tgz"
89+
export RELEASE_ARTIFACTS="$RELEASE_ARTIFACTS $STEM.$VERSION.tgz $STEM.latest.tgz"
90+
export DEV_ARTIFACTS="$DEV_ARTIFACTS $FQ_PACKAGE.tgz"
91+
# [[ ! -z $BRANCH ]] && export DEV_ARTIFACTS="$DEV_ARTIFACTS $STEM.$BRANCH.tgz"
7992

8093
echo "Done."
81-
}
94+
}
8295

8396
if [[ $1 == --help || $1 == help ]]; then
8497
cat <<-END
@@ -103,9 +116,20 @@ PRODUCT_LIB=$PRODUCT.so
103116

104117
GIT_VER=""
105118
if [[ -d $ROOT/.git ]]; then
106-
GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
119+
if [[ ! -z $BRANCH ]]; then
120+
GIT_BRANCH="$BRANCH"
121+
else
122+
GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
123+
fi
107124
GIT_COMMIT=$(git describe --always --abbrev=7 --dirty="+")
108125
GIT_VER="${GIT_BRANCH}-${GIT_COMMIT}"
126+
else
127+
if [[ ! -z $BRANCH ]]; then
128+
GIT_BRANCH="$BRANCH"
129+
else
130+
GIT_BRANCH=unknown
131+
fi
132+
GIT_VER="$GIT_BRANCH"
109133
fi
110134

111135
if ! command -v redis-server > /dev/null; then

‎opt/system-setup.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ def macosx(self):
5656
if out.splitlines() == []:
5757
fatal("Xcode tools are not installed. Please run xcode-select --install.")
5858

59-
# workaround for ssl issue, needed in CircleCI
60-
if os.environ.get('MACOS_PYTHON_SSL_FIX') == '1':
61-
self.run("brew unlink python@2")
62-
self.run("brew reinstall python3")
59+
# workaround for ssl issue, needed in CircleCI
60+
#if os.environ.get('MACOS_PYTHON_SSL_FIX') == '1':
61+
# self.run("brew unlink python@2")
62+
# self.run("brew reinstall python3")
6363

6464
self.install_gnu_utils()
6565
self.install("git-lfs")

0 commit comments

Comments
 (0)