Skip to content

Commit

Permalink
Merge pull request #15 from asgardeo/release-test1
Browse files Browse the repository at this point in the history
ci(android): update `commit_and_push.sh`
  • Loading branch information
Achintha444 authored May 7, 2024
2 parents d902583 + 1449b18 commit 9eb9d65
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/scripts/android/android_sdk_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ create_github_release() {
# Call the functions in sequence
update_versions
update_nexus_credentials
#release_android_sdks
release_android_sdks
update_snapshot_version
commit_and_push
create_github_release
17 changes: 0 additions & 17 deletions .github/workflows/scripts/common/commit_and_push.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,23 +61,6 @@ merge_to_master() {
git push origin "$MASTER_BRANCH"

echo "Merged $RELEASE_BRANCH into $MASTER_BRANCH"

# # Create a new branch for the pull request
# PR_BRANCH="pr-merge-$RELEASE_BRANCH"
# git checkout -b "$PR_BRANCH"

# # Merge the release branch into the new branch
# git merge --no-ff "$RELEASE_BRANCH" -m "[Mobile-SDKs Release] [GitHub Action #$GITHUB_RUN_NUMBER] [Release] [skip ci] Merge release branch $RELEASE_BRANCH"

# # Push the new branch to the remote repository
# git push origin "$PR_BRANCH"

# # Create a pull request using the GitHub API
# PR_TITLE="[Mobile-SDKs Release] [Release] Merge $RELEASE_BRANCH into $MASTER_BRANCH"
# PR_BODY="This pull request merges the $RELEASE_BRANCH branch into the $MASTER_BRANCH branch."
# PR_URL=$(gh pr create --title "$PR_TITLE" --body "$PR_BODY" --base "$MASTER_BRANCH" --head "$PR_BRANCH")

# echo "Pull request created: $PR_URL"
}

delete_release_branch() {
Expand Down

0 comments on commit 9eb9d65

Please sign in to comment.