Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/git-release-branch-create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ if [[ ! $current_branch =~ ^(release|support)/[0-9]+\.[0-9]+\.[0-9]+(-rc)?$ ]];
fi

version=$1
common_dependency_version=${2:-$version} # Use second parameter if provided, otherwise fallback to version

#Add changelog to the index and create a commit
podspec_file="Mindbox.podspec"
Expand All @@ -39,6 +40,9 @@ grep "spec.version" $podspec_file
sed -i '' "s/\(spec.dependency 'MindboxLogger', '\)[^']*\(\'\)/\1$version\2/g" "$podspec_file"
echo "$podspec_file dependency on MindboxLogger updated to $version."

sed -i '' "s/\(spec.dependency 'MindboxCommon', '\)[^']*\(\'\)/\1$common_dependency_version\2/g" "$podspec_file"
echo "$podspec_file dependency on MindboxCommon updated to $common_dependency_version."

sed -i '' "s/^\([[:space:]]*spec.version[[:space:]]*=[[:space:]]*\"\).*\(\"$\)/\1$version\2/" $podspec_file

echo "'Mindbox.podspec' After updating version:"
Expand Down Expand Up @@ -97,4 +101,3 @@ if ! git push origin $current_branch; then
echo "Failed to push changes to the origin $current_branch"
exit 1
fi

9 changes: 6 additions & 3 deletions .github/workflows/manual-prepare_release_branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ on:
release_version:
description: 'Release version (e.g. 1.2.3 or 1.2.3-rc)'
required: true
mindbox_common_version:
description: 'MindboxCommon version (defaults to release_version)'
required: false
source_branch:
description: 'Create branch from'
required: true
Expand Down Expand Up @@ -72,20 +75,20 @@ jobs:
id: bump
run: |
VERSION="${{ github.event.inputs.release_version }}"
VERSION_COMMON="${{ github.event.inputs.mindbox_common_version }}"
SRC="${{ github.event.inputs.source_branch }}"
REL="release/$VERSION"

echo "→ Branching from $SRC into $REL"
git checkout -b "$REL"

echo "→ Running bump script on $REL"
./.github/git-release-branch-create.sh "$VERSION"
./.github/git-release-branch-create.sh "$VERSION" "$VERSION_COMMON"

echo "release_branch=$REL" >> $GITHUB_OUTPUT

- name: Push release branch
run: |
git push origin "${{ steps.bump.outputs.release_branch }}"
run: git push origin "${{ steps.bump.outputs.release_branch }}"

check_sdk_version:
name: Check SDK Version
Expand Down