Merge pull request #4479 from RSSNext/sync/main-to-dev-20250915
Sync main branch to dev branch
This commit is contained in:
Innei
GitHub
commit
655776d1a6
|
|
@ -23,6 +23,7 @@ export default defineConfig({
|
|||
push: false,
|
||||
commitMessage: "release(mobile): release v${NEW_VERSION}",
|
||||
tagPrefix: "mobile@",
|
||||
tag: false,
|
||||
changelog: false,
|
||||
allowedBranches: ["dev"],
|
||||
})
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
# What's New in v0.2.8
|
||||
|
||||
## Shiny new things
|
||||
|
||||
## Improvements
|
||||
|
||||
## No longer broken
|
||||
|
||||
## Thanks
|
||||
|
||||
Special thanks to volunteer contributors @ for their valuable contributions
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
<key>CFBundlePackageType</key>
|
||||
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>0.2.7</string>
|
||||
<string>0.2.8</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleURLTypes</key>
|
||||
|
|
@ -53,7 +53,7 @@
|
|||
</dict>
|
||||
</array>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>133</string>
|
||||
<string>135</string>
|
||||
<key>ITSAppUsesNonExemptEncryption</key>
|
||||
<false/>
|
||||
<key>LSApplicationCategoryType</key>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@follow/mobile",
|
||||
"version": "0.2.7",
|
||||
"version": "0.2.8",
|
||||
"private": true,
|
||||
"main": "src/main.tsx",
|
||||
"scripts": {
|
||||
|
|
|
|||
|
|
@ -1,54 +0,0 @@
|
|||
{
|
||||
"internalTeamMembers": [
|
||||
"Innei",
|
||||
"DIYgod",
|
||||
"hyoban",
|
||||
"renovate[bot]",
|
||||
"github-actions[bot]",
|
||||
"dependabot[bot]",
|
||||
"vercel[bot]",
|
||||
"whitewater"
|
||||
],
|
||||
"aiModel": {
|
||||
"provider": "openai",
|
||||
"model": "gpt-4o-mini",
|
||||
"temperature": 0.3,
|
||||
"maxTokens": 1000,
|
||||
"apiKey": "",
|
||||
"baseURL": "https://openrouter.ai/v1",
|
||||
"customEndpoint": ""
|
||||
},
|
||||
"commitAnalysis": {
|
||||
"categories": {
|
||||
"features": {
|
||||
"keywords": ["feat", "feature", "add", "implement", "introduce"],
|
||||
"section": "Shiny new things"
|
||||
},
|
||||
"improvements": {
|
||||
"keywords": ["improve", "enhance", "optimize", "refactor", "update", "perf"],
|
||||
"section": "Improvements"
|
||||
},
|
||||
"fixes": {
|
||||
"keywords": ["fix", "bug", "patch", "resolve", "correct"],
|
||||
"section": "No longer broken"
|
||||
}
|
||||
},
|
||||
"ignorePatterns": [
|
||||
"^chore:",
|
||||
"^docs:",
|
||||
"^test:",
|
||||
"^ci:",
|
||||
"^build:",
|
||||
"Merge pull request",
|
||||
"Merge branch",
|
||||
"version bump",
|
||||
"changelog",
|
||||
"Update dependencies"
|
||||
]
|
||||
},
|
||||
"changelog": {
|
||||
"maxCommitsPerSection": 5,
|
||||
"includeCommitHash": true,
|
||||
"includePullRequestLinks": true
|
||||
}
|
||||
}
|
||||
|
|
@ -2,47 +2,68 @@
|
|||
|
||||
# Script to check if the current branch is a release branch and if there are staged changes in apps/mobile/src
|
||||
# If both conditions are met, automatically increment the iOS and Android build ID
|
||||
# Use -f flag to force increment regardless of branch or staged changes
|
||||
|
||||
set -e
|
||||
|
||||
# Get the current branch name
|
||||
CURRENT_BRANCH=$(git branch --show-current)
|
||||
# Parse command line arguments
|
||||
FORCE=false
|
||||
while [[ $# -gt 0 ]]; do
|
||||
case $1 in
|
||||
-f | --force)
|
||||
FORCE=true
|
||||
shift
|
||||
;;
|
||||
*)
|
||||
echo "Unknown option $1"
|
||||
echo "Usage: $0 [-f|--force]"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
# Check if it is a release branch
|
||||
if [[ ! "$CURRENT_BRANCH" =~ ^release/ ]]; then
|
||||
exit 0
|
||||
# If force flag is not set, perform the usual checks
|
||||
if [ "$FORCE" = false ]; then
|
||||
# Get the current branch name
|
||||
CURRENT_BRANCH=$(git branch --show-current)
|
||||
|
||||
# Check if it is a release branch
|
||||
if [[ ! "$CURRENT_BRANCH" =~ ^release/ ]]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Check if there are staged changes in apps/mobile/src
|
||||
MOBILE_SRC_CHANGES=$(git diff --cached --name-only | grep "^apps/mobile/src" || true)
|
||||
|
||||
if [ -z "$MOBILE_SRC_CHANGES" ]; then
|
||||
echo "No changes in apps/mobile/src, skipping build ID increment"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "Found changes in apps/mobile/src on release branch, incrementing build ID..."
|
||||
else
|
||||
echo "Force flag detected, incrementing build ID..."
|
||||
fi
|
||||
|
||||
# Check if there are staged changes in apps/mobile/src
|
||||
MOBILE_SRC_CHANGES=$(git diff --cached --name-only | grep "^apps/mobile/src" || true)
|
||||
|
||||
if [ -z "$MOBILE_SRC_CHANGES" ]; then
|
||||
echo "No changes in apps/mobile/src, skipping build ID increment"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "Found changes in apps/mobile/src on release branch, incrementing build ID..."
|
||||
|
||||
# iOS Info.plist path
|
||||
IOS_INFO_PLIST="apps/mobile/ios/Folo/Info.plist"
|
||||
|
||||
if [ -f "$IOS_INFO_PLIST" ]; then
|
||||
# Get the current build ID
|
||||
CURRENT_BUILD=$(plutil -extract CFBundleVersion raw "$IOS_INFO_PLIST")
|
||||
|
||||
|
||||
# Increment build ID
|
||||
NEW_BUILD=$((CURRENT_BUILD + 1))
|
||||
|
||||
|
||||
# Update Info.plist
|
||||
plutil -replace CFBundleVersion -string "$NEW_BUILD" "$IOS_INFO_PLIST"
|
||||
|
||||
|
||||
echo "iOS build ID updated from $CURRENT_BUILD to $NEW_BUILD"
|
||||
|
||||
|
||||
# Add the updated Info.plist to the staged area
|
||||
git add "$IOS_INFO_PLIST"
|
||||
else
|
||||
echo "Warning: iOS Info.plist not found at $IOS_INFO_PLIST"
|
||||
fi
|
||||
|
||||
|
||||
echo "Build ID increment completed"
|
||||
echo "Build ID increment completed"
|
||||
|
|
|
|||
Loading…
Reference in New Issue