Merge workflows into a single one

for minor release.

For better understanding:
- Edit names of steps in the workflow
- Edit branch names in the script

.github/workflows/create_minor_release_PR_commit.yaml → .github/workflows/minor_release.yaml

@@ -1,4 +1,4 @@
-name: Create minor release PR commit
+name: Minor release
 on:
   workflow_dispatch:
 
@@ -7,8 +7,8 @@ permissions:
   contents: write
 
 jobs:
-  create-minor-release-PR-commit:
-    name: Create minor release PR commit
+  minor-release:
+    name: Minor release
     runs-on: ubuntu-latest
 
     steps:
@@ -24,7 +24,21 @@ jobs:
       - name: Checkout TimescaleDB
         uses: actions/checkout@v4
 
-      - name: Run the minor-release PR creation Script
+      - name: Create PR to main branch for minor release
+        env:
+          GITHUB_TOKEN: ${{ secrets.ORG_AUTOMATION_TOKEN }}
+        run: |
+          git remote --verbose
+          scripts/release/create_minor_release_PR_commit.sh
+
+      - name: Create release branch for minor release
+        env:
+          GITHUB_TOKEN: ${{ secrets.ORG_AUTOMATION_TOKEN }}
+        run: |
+          git remote --verbose
+          scripts/release/create_minor_release_branch.sh
+
+      - name: Create PR to release branch for minor release
         env:
           GITHUB_TOKEN: ${{ secrets.ORG_AUTOMATION_TOKEN }}
         run: |

scripts/release/create_minor_release_PR_commit.sh

@@ -37,7 +37,7 @@ cd ~/"$SOURCES_DIR"/"$FORK_DIR"
 
 
 # Derived Variables
-RELEASE_PR_BRANCH="release/release-$NEW_VERSION"
+RELEASE_PR_BRANCH="release/$NEW_VERSION"
 UPDATE_FILE="$CURRENT_VERSION--$NEW_VERSION.sql"
 DOWNGRADE_FILE="$NEW_VERSION--$CURRENT_VERSION.sql"
 LAST_UPDATE_FILE="$LAST_VERSION--$CURRENT_VERSION.sql"
@@ -49,7 +49,7 @@ if [[ $RELEASE_BRANCH_EXISTS == '0' ]]; then
   echo "git branch '$RELEASE_BRANCH' does not exist in the remote repository, yet"
   echo "We want to raise this PR against main"
   RELEASE_BRANCH="main"
-  RELEASE_PR_BRANCH="$RELEASE_PR_BRANCH-main"
+  RELEASE_PR_BRANCH="$RELEASE_PR_BRANCH-to-main"
 fi
 
 echo "final RELEASE_BRANCH is $RELEASE_BRANCH"