From 3d6ef03fa1c974969ffb502c50540ae5674e9493 Mon Sep 17 00:00:00 2001 From: Achintha Isuru Date: Tue, 7 May 2024 18:13:30 +0530 Subject: [PATCH 1/2] ci(android): update `commit_and_push.sh` --- .../workflows/scripts/common/commit_and_push.sh | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/.github/workflows/scripts/common/commit_and_push.sh b/.github/workflows/scripts/common/commit_and_push.sh index 4415051..c656e13 100644 --- a/.github/workflows/scripts/common/commit_and_push.sh +++ b/.github/workflows/scripts/common/commit_and_push.sh @@ -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() { From 1449b1855ad28d715678881b53b7fa59f23631e0 Mon Sep 17 00:00:00 2001 From: Achintha Isuru Date: Tue, 7 May 2024 18:15:03 +0530 Subject: [PATCH 2/2] ci(android): update `android_sdk_release.sh` --- .github/workflows/scripts/android/android_sdk_release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scripts/android/android_sdk_release.sh b/.github/workflows/scripts/android/android_sdk_release.sh index 1f27470..32179a5 100644 --- a/.github/workflows/scripts/android/android_sdk_release.sh +++ b/.github/workflows/scripts/android/android_sdk_release.sh @@ -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