sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'canary_release' into develop_liyi

Browse Source
This commit is contained in:
Liuyf 2025-02-18 13:48:49 +08:00
commit 93b14473bd
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
android/app/src/sky/agconnect-services.json
View File

@ -26,21 +26,21 @@
"SG_back":"connect-ws-dra.hispace.dbankcloud.com"
},
"client":{
"cp_id":"30086000752967166",
"product_id":"388421841222116270",
"client_id":"1406555529261648640",
"client_secret":"843E8191B02B692239726CF0ED990E1EC2B31928F825AA012B932A128FD2C516",
"project_id":"388421841222116270",
"app_id":"110798531",
"api_key":"DQEDAALnPCtuCgoYOyZfsIDa9/YZZhQ+buDGpypeurXhQUGMajWcVyYLQgXXqV3x2HbI6oyG+Wm2Gf+1hPs6j+wA3B6ylYAXG4aAQA==",
"cp_id":"30086000764882919",
"product_id":"388421841222019909",
"client_id":"1376040077926370048",
"client_secret":"FE068E768F2B897A291DFFD186E0C0E495BE4BE6CCD7C5973B6C02ADF9178916",
"project_id":"388421841222019909",
"app_id":"110413691",
"api_key":"DAEDAG1Mu4qubka2IheS5XVoQQIyqAr2tU+VyLcUukdN4iHjP9FZRI16fUIhWz+lsz8si57hQ/gjoNNvQBmgglsT5jnXFcnY4nF1wQ==",
"package_name":"com.skychip.lock"
},
"oauth_client":{
"client_id":"110798531",
"client_id":"110413691",
"client_type":1
},
"app_info":{
"app_id":"110798531",
"app_id":"110413691",
"package_name":"com.skychip.lock"
},
"service":{
@ -81,15 +81,15 @@
{
"package_name":"com.skychip.lock",
"client":{
"app_id":"110798531"
"app_id":"110413691"
},
"app_info":{
"package_name":"com.skychip.lock",
"app_id":"110798531"
"app_id":"110413691"
},
"oauth_client":{
"client_type":1,
"client_id":"110798531"
"client_id":"110413691"
}
}
]

15
tag_generator.sh
View File

@ -27,22 +27,23 @@ else
fi
echo "compare_json:$compare_json\n"
new_patch=$patch
new_minor=$minor
while IFS= read -r commit_json; do
# 使用 jq 解析每一行的 JSON 对象
commit_id=$(echo "$commit_json" | jq -r '.id')
commit_message=$(echo "$commit_json" | jq -r '.message')
echo "----$commit_message"
if [[ "$commit_message" =~ ("feat:"*) ]]; then
((minor++))
new_patch=0
break
elif [[ "$commit_message" =~ ("fix:"*) ]] && [[ $new_patch == $patch ]]; then
if [[ "$commit_message" =~ ("feat:"*) ]] && [[ $new_minor == $minor ]]; then
((new_minor++))
# new_patch=0
# break
elif [[ "$commit_message" =~ ("fix:"*) ]]; then
((new_patch++))
elif [[ ! "$commit_message" =~ ("Merge"* | "Revert"*) ]] && [[ $new_patch == $patch ]]; then
elif [[ ! "$commit_message" =~ ("Merge"* | "Revert"*) ]]; then
((new_patch++))
fi
done < <(echo "$compare_json" | jq -c '.commits[] | {id: .id, message: .message}')
next_tag="v$major.$minor.$new_patch"
next_tag="v$major.$new_minor.$new_patch"
fi
echo "New Tag:$newest_tag;New version: $next_tag;command: $1"
if [[ "$1" == "generate_tag" ]];then