fix: keep version
This commit is contained in:
43
build_dmg
43
build_dmg
@@ -97,6 +97,7 @@ ask_version_bump() {
|
|||||||
5)
|
5)
|
||||||
echo "Keeping current version v${CURRENT_VERSION}"
|
echo "Keeping current version v${CURRENT_VERSION}"
|
||||||
NEW_VERSION="$CURRENT_VERSION"
|
NEW_VERSION="$CURRENT_VERSION"
|
||||||
|
BUMP_TYPE="keep"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "Invalid choice"
|
echo "Invalid choice"
|
||||||
@@ -120,10 +121,17 @@ ask_version_bump() {
|
|||||||
|
|
||||||
# Ask for confirmation to proceed with version bumping
|
# Ask for confirmation to proceed with version bumping
|
||||||
echo ""
|
echo ""
|
||||||
echo "This will:"
|
if [ "$BUMP_TYPE" = "keep" ]; then
|
||||||
echo " 1. Update project.pbxproj → MARKETING_VERSION = ${NEW_VERSION}"
|
echo "This will:"
|
||||||
echo " 2. Update project.pbxproj → CURRENT_PROJECT_VERSION = ${DISPLAY_NEW_BUILD} (currently ${DISPLAY_CURRENT_BUILD})"
|
echo " 1. Keep MARKETING_VERSION = ${NEW_VERSION}"
|
||||||
echo " 3. Create git tag v${NEW_VERSION}"
|
echo " 2. Update project.pbxproj → CURRENT_PROJECT_VERSION = ${DISPLAY_NEW_BUILD} (currently ${DISPLAY_CURRENT_BUILD})"
|
||||||
|
echo " 3. Create git commit (no new tag)"
|
||||||
|
else
|
||||||
|
echo "This will:"
|
||||||
|
echo " 1. Update project.pbxproj → MARKETING_VERSION = ${NEW_VERSION}"
|
||||||
|
echo " 2. Update project.pbxproj → CURRENT_PROJECT_VERSION = ${DISPLAY_NEW_BUILD} (currently ${DISPLAY_CURRENT_BUILD})"
|
||||||
|
echo " 3. Create git tag v${NEW_VERSION}"
|
||||||
|
fi
|
||||||
echo ""
|
echo ""
|
||||||
read -p "Proceed with version bump? (y/n) " -n 1 -r
|
read -p "Proceed with version bump? (y/n) " -n 1 -r
|
||||||
echo ""
|
echo ""
|
||||||
@@ -135,9 +143,11 @@ ask_version_bump() {
|
|||||||
# Update project files
|
# Update project files
|
||||||
echo "[1/3] Updating project version..."
|
echo "[1/3] Updating project version..."
|
||||||
|
|
||||||
# Update MARKETING_VERSION
|
# Update MARKETING_VERSION (unless keeping)
|
||||||
sed -i.bak "s/MARKETING_VERSION = [0-9.]*;/MARKETING_VERSION = ${NEW_VERSION};/" Gaze.xcodeproj/project.pbxproj
|
if [ "$BUMP_TYPE" != "keep" ]; then
|
||||||
rm -f Gaze.xcodeproj/project.pbxproj.bak
|
sed -i.bak "s/MARKETING_VERSION = [0-9.]*;/MARKETING_VERSION = ${NEW_VERSION};/" Gaze.xcodeproj/project.pbxproj
|
||||||
|
rm -f Gaze.xcodeproj/project.pbxproj.bak
|
||||||
|
fi
|
||||||
|
|
||||||
# Update CURRENT_PROJECT_VERSION (build number) - increment by 1
|
# Update CURRENT_PROJECT_VERSION (build number) - increment by 1
|
||||||
CURRENT_BUILD=$(grep -A 1 "CURRENT_PROJECT_VERSION" Gaze.xcodeproj/project.pbxproj | grep -o '[0-9]\+' | head -1)
|
CURRENT_BUILD=$(grep -A 1 "CURRENT_PROJECT_VERSION" Gaze.xcodeproj/project.pbxproj | grep -o '[0-9]\+' | head -1)
|
||||||
@@ -153,12 +163,21 @@ ask_version_bump() {
|
|||||||
# Stage changes and commit
|
# Stage changes and commit
|
||||||
echo "[2/3] Committing changes..."
|
echo "[2/3] Committing changes..."
|
||||||
git add Gaze.xcodeproj/project.pbxproj
|
git add Gaze.xcodeproj/project.pbxproj
|
||||||
git commit -m "Version bump to v${NEW_VERSION}"
|
if [ "$BUMP_TYPE" = "keep" ]; then
|
||||||
|
git commit -m "Build bump to v${NEW_VERSION} (${BUILD_NUMBER})"
|
||||||
|
else
|
||||||
|
git commit -m "Version bump to v${NEW_VERSION}"
|
||||||
|
fi
|
||||||
|
|
||||||
# Create tag
|
# Create tag (skip if keeping version)
|
||||||
echo "[3/3] Creating tag..."
|
if [ "$BUMP_TYPE" != "keep" ]; then
|
||||||
git tag -a "v${NEW_VERSION}" -m "Release version ${NEW_VERSION}"
|
echo "[3/3] Creating tag..."
|
||||||
echo "✓ Version bumped to v${NEW_VERSION}"
|
git tag -a "v${NEW_VERSION}" -m "Release version ${NEW_VERSION}"
|
||||||
|
echo "✓ Version bumped to v${NEW_VERSION}"
|
||||||
|
else
|
||||||
|
echo "[3/3] Skipping tag creation (keeping version)"
|
||||||
|
echo "✓ Build number bumped to ${BUILD_NUMBER}"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Ask whether to bump version before continuing
|
# Ask whether to bump version before continuing
|
||||||
|
|||||||
Reference in New Issue
Block a user