Skip to content

Commit 8ad5ae9

Browse files
committed
reuse the apple installation shell for android.
1 parent 25d2e38 commit 8ad5ae9

File tree

6 files changed

+10
-5
lines changed

6 files changed

+10
-5
lines changed

.github/workflows/onestep.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ function compile_android_platform
6868
{
6969
echo "---do compile android libs--------------------------------------"
7070
./main.sh compile -p android -c build -l ${LIB_NAME}
71-
cd build/product/android/universal/${LIB_NAME}
71+
cd build/product/android/universal
7272
zip -rq $DIST_DIR/${LIB_NAME}-android-universal-${RELEASE_VERSION}.zip ./*
7373
cd $ROOT_DIR
7474
}
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,12 @@ fi
4848

4949
# opus-1.3.1-231124151836
5050
LIB_NAME=$(echo $PRE_COMPILE_TAG | awk -F - '{print $1}')
51-
VER=$(echo $PRE_COMPILE_TAG | awk -F - '{print $2}')
51+
prefix="${LIB_NAME}-"
52+
suffix=$(echo $PRE_COMPILE_TAG | awk -F - '{printf "-%s", $NF}')
53+
# 去掉前缀
54+
temp=${PRE_COMPILE_TAG#$prefix}
55+
# 去掉后缀
56+
VER=${temp%$suffix}
5257

5358
if [[ "$MR_PLAT" == 'ios' || "$MR_PLAT" == 'tvos' ]];then
5459
install_plat

main.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ case $MR_PLAT in
5555
;;
5656
esac
5757

58-
if [[ "$MR_ACTION" == "init" ]];then
59-
./do-init/main.sh "$@"
58+
if [[ "$MR_ACTION" == "init" || "$MR_ACTION" == "install" ]];then
59+
./do-$MR_ACTION/main.sh "$@"
6060
else
6161
./do-$MR_ACTION/$plat/main.sh "$@"
6262
fi
6363

64-
echo "---3.$MR_ACTION end-------------------------------"
64+
echo "---$MR_ACTION end-------------------------------"
6565
echo
6666

6767
elapsed

0 commit comments

Comments
 (0)