diff --git a/trunk/3rdparty/signaling/.gitignore b/trunk/3rdparty/signaling/.gitignore index 28a12d9aa..7b3c935dc 100644 --- a/trunk/3rdparty/signaling/.gitignore +++ b/trunk/3rdparty/signaling/.gitignore @@ -17,3 +17,5 @@ .format.txt objs .DS_Store +.idea + diff --git a/trunk/3rdparty/signaling/auto/pub.sh b/trunk/3rdparty/signaling/auto/pub.sh new file mode 100755 index 000000000..017948741 --- /dev/null +++ b/trunk/3rdparty/signaling/auto/pub.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +REALPATH=$(realpath $0) +WORK_DIR=$(cd $(dirname $REALPATH)/.. && pwd) +echo "Run pub at $WORK_DIR from $0" +cd $WORK_DIR + +git st |grep -q 'nothing to commit' +if [[ $? -ne 0 ]]; then + echo "Failed: Please commit before release"; + exit 1 +fi + +RELEASE=$(git describe --tags --abbrev=0 --exclude release-*) +REVISION=$(echo $RELEASE|awk -F . '{print $3}') +let NEXT=$REVISION+1 +echo "Last release is $RELEASE, revision is $REVISION, next is $NEXT" + +TAG="v1.0.$NEXT" +echo "publish $TAG" + +git push +git tag -d $TAG 2>/dev/null && git push origin :$TAG +git tag $TAG +git push origin $TAG +echo "publish $TAG ok" +echo " https://github.com/ossrs/signaling/actions" diff --git a/trunk/3rdparty/signaling/auto/release.sh b/trunk/3rdparty/signaling/auto/release.sh deleted file mode 100755 index c63c9e7b7..000000000 --- a/trunk/3rdparty/signaling/auto/release.sh +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/bash - -SRS_GIT=$HOME/git/signaling -SRS_TAG= - -# linux shell color support. -RED="\\033[31m" -GREEN="\\033[32m" -YELLOW="\\033[33m" -BLACK="\\033[0m" - -function NICE() { - echo -e "${GREEN}$@${BLACK}" -} - -function TRACE() { - echo -e "${BLACK}$@${BLACK}" -} - -function WARN() { - echo -e "${YELLOW}$@${BLACK}" -} - -function ERROR() { - echo -e "${RED}$@${BLACK}" -} - -################################################################################## -################################################################################## -################################################################################## -if [[ -z $SRS_TAG ]]; then - SRS_TAG=`(cd $SRS_GIT && git describe --tags --abbrev=0 --exclude release-* 2>/dev/null)` - if [[ $? -ne 0 ]]; then - echo "Invalid tag $SRS_TAG of $SRS_FILTER in $SRS_GIT" - exit -1 - fi -fi - -NICE "Build docker for $SRS_GIT, tag is $SRS_TAG" - -git ci -am "Release $SRS_TAG" - -# For aliyun hub. -NICE "aliyun hub release-v$SRS_TAG" - -echo "git push aliyun" -git push aliyun - -git tag -d release-v$SRS_TAG 2>/dev/null -echo "Cleanup tag $SRS_TAG for aliyun" - -git tag release-v$SRS_TAG; git push -f aliyun release-v$SRS_TAG -echo "Create new tag $SRS_TAG for aliyun" -echo "" - -NICE "aliyun hub release-vlatest" -git tag -d release-vlatest 2>/dev/null -echo "Cleanup tag latest for aliyun" - -git tag release-vlatest; git push -f aliyun release-vlatest -echo "Create new tag latest for aliyun" - -# For github.com -echo "git push origin" -git push origin - -echo "git push origin $SRS_TAG" -git push origin $SRS_TAG - -NICE "Update github ok" diff --git a/trunk/3rdparty/signaling/www/demos/img/shields-io-signaling.svg b/trunk/3rdparty/signaling/www/demos/img/shields-io-signaling.svg new file mode 100644 index 000000000..1ae3dc2d2 --- /dev/null +++ b/trunk/3rdparty/signaling/www/demos/img/shields-io-signaling.svg @@ -0,0 +1 @@ +Stars27 \ No newline at end of file diff --git a/trunk/3rdparty/signaling/www/demos/one2one.html b/trunk/3rdparty/signaling/www/demos/one2one.html index aa953074b..6ed8a00fb 100644 --- a/trunk/3rdparty/signaling/www/demos/one2one.html +++ b/trunk/3rdparty/signaling/www/demos/one2one.html @@ -26,7 +26,7 @@
  • 多人通话
  • - GitHub Repo stars + GitHub Repo stars
  • diff --git a/trunk/3rdparty/signaling/www/demos/room.html b/trunk/3rdparty/signaling/www/demos/room.html index 164213d95..e061dec48 100644 --- a/trunk/3rdparty/signaling/www/demos/room.html +++ b/trunk/3rdparty/signaling/www/demos/room.html @@ -26,7 +26,7 @@
  • 多人通话
  • - GitHub Repo stars + GitHub Repo stars