Skip to content

Commit fe25e2e

Browse files
committed
Add separate beta argument for triggering beta Xcode cloud workflow
1 parent 96f35d1 commit fe25e2e

File tree

2 files changed

+30
-10
lines changed

2 files changed

+30
-10
lines changed

ci_scripts/ci_post_clone.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,12 @@ bump_version() {
5858
echo "${version_parts[0]}.${version_parts[1]}.${version_parts[2]}"
5959
}
6060

61-
# Extract version bump
62-
case "$(echo "$CI_TAG" | sed -n 's/^trigger-build-bump-\(.*\)-date-.*$/\1/p')" in
61+
# Extract version bump from either trigger-build or trigger-beta-build tags
62+
version_bump_part=""
63+
if [[ "$CI_TAG" =~ ^trigger-(beta-)?build-bump-(.*)-date-.*$ ]]; then
64+
version_bump_part="${BASH_REMATCH[2]}"
65+
fi
66+
case "$version_bump_part" in
6367
"patch")
6468
newVersionString=$(bump_version "$versionString" "patch")
6569
;;

scripts/push_build

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,39 @@ TAG_BUMP="bump"
1616
DEFAULT_TAG_BUMP="patch"
1717
DEFAULT_TAG="$TAG_START-$TAG_BUMP-$DEFAULT_TAG_BUMP"
1818

19-
# Positional arguments:
20-
# $1 = bump [patch (default)|minor|major]
19+
# Parse arguments
20+
BETA_BUILD=false
21+
VERSION_BUMP=""
2122

22-
if [ $# -eq 0 ]; then
23-
TAG=$DEFAULT_TAG
24-
else
23+
while [[ $# -gt 0 ]]; do
2524
case $1 in
26-
"minor"|"major"|"patch")
27-
TAG="$TAG_START-$TAG_BUMP-$1"
25+
--beta)
26+
BETA_BUILD=true
27+
shift
28+
;;
29+
patch|minor|major)
30+
VERSION_BUMP="$1"
31+
shift
2832
;;
2933
*)
30-
echo "Invalid bump argument. Usage: $0 [patch (default)|minor|major]"
34+
echo "Invalid argument. Usage: $0 [patch|minor|major] [--beta]"
3135
exit 1
3236
;;
3337
esac
38+
done
39+
40+
# Set tag prefix based on beta flag
41+
if [ "$BETA_BUILD" = true ]; then
42+
TAG_START="trigger-beta-build"
3443
fi
3544

45+
# Set version bump (default to patch)
46+
if [ -z "$VERSION_BUMP" ]; then
47+
VERSION_BUMP="$DEFAULT_TAG_BUMP"
48+
fi
49+
50+
TAG="$TAG_START-$TAG_BUMP-$VERSION_BUMP"
51+
3652
if [ "$TAG" != "$DEFAULT_TAG" ]; then
3753
read -p "Are you sure you want to push tag '$TAG'? (y/n): " choice
3854
if [ "$choice" != "y" ]; then

0 commit comments

Comments
 (0)