Skip to content

Commit 31cefd9

Browse files
committed
Fix script to strip beta/alpha tags from framework
1 parent a123535 commit 31cefd9

File tree

1 file changed

+35
-14
lines changed

1 file changed

+35
-14
lines changed

prepare_release.sh

Lines changed: 35 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,19 @@ if [[ "$1" == "-v" ]]; then
77
mute=
88
fi
99

10+
# -- For debug uncomment selectively
11+
# workdir="/var/folders/d5/vbxjsy7967g9x3twy08jyggm0000gn/T/tmp.X6nlENOZIM"
12+
# new_version="3.0.8"
13+
# grdb_tag="v7.0.0-beta.6"
14+
# sqlcipher_tag="v4.6.1"
15+
# xcframework_zip="${workdir}/GRDB.xcframework.zip"
16+
1017
cwd="$(dirname "${BASH_SOURCE[0]}")"
1118
workdir="$(mktemp -d)"
1219
mkdir -p "${workdir}/Logs"
13-
# trap 'rm -rf "$workdir"' EXIT
1420
grdb_dir="${workdir}/GRDB-source"
1521
sqlcipher_dir="${workdir}/sqlcipher-source"
1622

17-
# For debug uncomment selectively
18-
# workdir="/var/folders/d5/vbxjsy7967g9x3twy08jyggm0000gn/T/tmp.wlUxvocA0c"
19-
# new_version="3.0.6"
20-
# grdb_tag="v7.0.0-beta.6"
21-
# sqlcipher_tag="v4.6.1"
22-
# xcframework_zip="${workdir}/GRDB.xcframework.zip"
23-
2423
export new_version upstream_version="${grdb_tag#v}" sqlcipher_version="${sqlcipher_tag#v}"
2524

2625
print_usage_and_exit() {
@@ -93,12 +92,12 @@ update_readme() {
9392
export new_version upstream_version="${grdb_tag#v}" sqlcipher_version="${sqlcipher_tag#v}"
9493

9594
# Check if versions are the same as before to skip release
96-
if [[ "${current_upstream_version}" == "${upstream_version}" ]] &&
97-
[[ "${current_sqlcipher_version}" == "${sqlcipher_version}" ]] &&
98-
[[ -z "$force_release" ]]; then
99-
echo "GRDB.swift (${upstream_version}) and SQLCipher (${sqlcipher_version}) versions did not change. Skipping release."
100-
exit 1
101-
fi
95+
# if [[ "${current_upstream_version}" == "${upstream_version}" ]] &&
96+
# [[ "${current_sqlcipher_version}" == "${sqlcipher_version}" ]] &&
97+
# [[ -z "$force_release" ]]; then
98+
# echo "GRDB.swift (${upstream_version}) and SQLCipher (${sqlcipher_version}) versions did not change. Skipping release."
99+
# exit 1
100+
# fi
102101

103102
cat <<-EOF
104103
@@ -252,6 +251,25 @@ build_and_test_release() {
252251
fi
253252
}
254253

254+
sanitize_version() {
255+
# Remove any beta/alpha suffixes and keep only the first three number groups
256+
echo "${grdb_tag#v}" | sed -E 's/[-].+$//' | cut -d. -f1-3
257+
}
258+
259+
update_framework_version() {
260+
local clean_version=$(sanitize_version)
261+
local info_plist="${grdb_dir}/Support/Info.plist"
262+
263+
printf '%s' "Updating framework version to ${clean_version} ... "
264+
if /usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${clean_version}" "$info_plist"; then
265+
echo ""
266+
else
267+
echo ""
268+
echo "Failed to update framework version in Info.plist"
269+
exit 1
270+
fi
271+
}
272+
255273
build_archive() {
256274
local platform=$1
257275
local archives_path=$2
@@ -384,11 +402,14 @@ main() {
384402

385403
read_command_line_arguments "$@"
386404

405+
echo "Current grdb_tag: ${grdb_tag}" # Debug output
406+
387407
clone_grdb "$grdb_tag"
388408
clone_sqlcipher
389409
update_readme
390410
build_sqlcipher
391411
patch_grdb
412+
update_framework_version
392413
build_and_test_release
393414
build_xcframework
394415
update_swift_package

0 commit comments

Comments
 (0)