You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ch...@apache.org on 2019/12/23 06:01:35 UTC
[servicecomb-toolkit] branch master updated (84f0c9d -> 7ca2bdf)
This is an automated email from the ASF dual-hosted git repository.
chanjarster pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-toolkit.git.
from 84f0c9d [SCB-1663] test cli.sh in travis ci and fix some bug
new 7f67be4 [SCB-1660] change deploy.sh format
new 7ca2bdf [SCB-1660] remove the tagged commit check
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
scripts/deploy.sh | 60 +++++++++++++++++++++++++++++--------------------------
1 file changed, 32 insertions(+), 28 deletions(-)
[servicecomb-toolkit] 02/02: [SCB-1660] remove the tagged commit
check
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chanjarster pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-toolkit.git
commit 7ca2bdf50844382d88eba5ca6345651ced2f66a3
Author: kakulisen <18...@163.com>
AuthorDate: Fri Dec 13 17:36:31 2019 +0800
[SCB-1660] remove the tagged commit check
Signed-off-by: kakulisen <18...@163.com>
---
scripts/deploy.sh | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 5ca8fd5..5b6e129 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -17,16 +17,9 @@
## ---------------------------------------------------------------------------
#bin/sh
-TAGGEDCOMMIT=$(git tag -l --contains HEAD)
-if [ "$TAGGEDCOMMIT" == "" ]; then
- TAGGEDCOMMIT=false
-else
- TAGGEDCOMMIT=true
-fi
-echo "${green}[SCRIPT] TAGGEDCOMMIT=$TAGGEDCOMMIT${reset}"
VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-if [[ "$TAGGEDCOMMIT" == "true" ]] || [[ ! $VERSION =~ "SNAPSHOT" ]]; then
- echo "${green}[SCRIPT] Skipping the Non-Signed Staging deploy as it is tagged commit.${reset}"
+if [[ ! $VERSION =~ "SNAPSHOT" ]]; then
+ echo "${green}[SCRIPT] Not Snapshot Version,Skipping Deployment.${reset}"
else
echo "Deploy a Non-Signed Staging Release"
mvn deploy -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B -DskipTests --settings .travis.settings.xml
[servicecomb-toolkit] 01/02: [SCB-1660] change deploy.sh format
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chanjarster pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-toolkit.git
commit 7f67be431bc3b692f967aa93c32f25cef0daf8d6
Author: kakulisen <18...@163.com>
AuthorDate: Thu Dec 12 09:55:23 2019 +0800
[SCB-1660] change deploy.sh format
Signed-off-by: kakulisen <18...@163.com>
---
scripts/deploy.sh | 67 ++++++++++++++++++++++++++++++++-----------------------
1 file changed, 39 insertions(+), 28 deletions(-)
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index b68544c..5ca8fd5 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -1,28 +1,39 @@
-#!/usr/bin/env bash
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-#bin/sh
-
-echo "Deploy a Non-Signed Staging Release"
-mvn deploy -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B -DskipTests --settings .travis.settings.xml
-if [ $? == 0 ]; then
- echo "${green}Snapshot Deployment is Success, please log on to Nexus Repo to see the snapshot release..${reset}"
-else
- echo "${red}Snapshot deployment failed.${reset}"
-fi
-
-echo "Deployment Completed"
+#!/usr/bin/env bash
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+#bin/sh
+
+TAGGEDCOMMIT=$(git tag -l --contains HEAD)
+if [ "$TAGGEDCOMMIT" == "" ]; then
+ TAGGEDCOMMIT=false
+else
+ TAGGEDCOMMIT=true
+fi
+echo "${green}[SCRIPT] TAGGEDCOMMIT=$TAGGEDCOMMIT${reset}"
+VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+if [[ "$TAGGEDCOMMIT" == "true" ]] || [[ ! $VERSION =~ "SNAPSHOT" ]]; then
+ echo "${green}[SCRIPT] Skipping the Non-Signed Staging deploy as it is tagged commit.${reset}"
+else
+ echo "Deploy a Non-Signed Staging Release"
+ mvn deploy -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B -DskipTests --settings .travis.settings.xml
+ if [ $? == 0 ]; then
+ echo "${green}Snapshot Deployment is Success, please log on to Nexus Repo to see the snapshot release..${reset}"
+ else
+ echo "${red}Snapshot deployment failed.${reset}"
+ fi
+ echo "Deployment Completed"
+fi