From 960fe14324a2030b795c3135cb6a378245bfcc40 Mon Sep 17 00:00:00 2001
From: MarkG <markgravity.in@gmail.com>
Date: Tue, 5 Nov 2024 15:19:21 +0700
Subject: [PATCH] test

---
 .../create_release_pull_request.yml             | 15 ++++++---------
 .../workflows/create_release_pull_request.yml   | 17 ++++++++++-------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/project_workflows/create_release_pull_request.yml b/.github/project_workflows/create_release_pull_request.yml
index d35268c5..c9dcd65f 100644
--- a/.github/project_workflows/create_release_pull_request.yml
+++ b/.github/project_workflows/create_release_pull_request.yml
@@ -7,9 +7,6 @@ on:
         description: "Next version (eg. 1.0.0)"
         required: true
         type: string
-  push:
-    branches: 
-      - feature/557-automate-release-pull-request-creation-process
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -67,15 +64,15 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          branch: chore/bump-version-to-1.1.0
+          branch: chore/bump-version-to-${{ github.event.inputs.nextVersion }}
 
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          ref: chore/bump-version-to-1.1.0
+          ref: chore/bump-version-to-${{ github.event.inputs.nextVersion }}
 
       - name: Bump version
-        run: sed -i "" "s/MARKETING_VERSION = .*/MARKETING_VERSION = 1.1.0;/g" Smashburger.xcodeproj/project.pbxproj
+        run: sed -i "" "s/MARKETING_VERSION = .*/MARKETING_VERSION = ${{ github.event.inputs.nextVersion }};/g" Smashburger.xcodeproj/project.pbxproj
       
       - name: Set up Git
         run: |
@@ -85,12 +82,12 @@ jobs:
       - name: Commit changes
         run: |
           git add .
-          git commit -m "[Chore] Bump version to 1.1.0"
+          git commit -m "[Chore] Bump version to ${{ github.event.inputs.nextVersion }}"
           git push origin HEAD
 
       - name: Create pull request
         run: |
-          echo -e "## What happened 👀\n\nBump version to 1.1.0" > body
-          export body=$(cat body) ; gh pr create --draft -B develop -H chore/bump-version-to-1.1.0 -t '[Chore] Bump version to 1.1.0' -b "$body"
+          echo -e "## What happened 👀\n\nBump version to ${{ github.event.inputs.nextVersion }}" > body
+          export body=$(cat body) ; gh pr create --draft -B develop -H chore/bump-version-to-${{ github.event.inputs.nextVersion }} -t '[Chore] Bump version to ${{ github.event.inputs.nextVersion }}' -b "$body"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/create_release_pull_request.yml b/.github/workflows/create_release_pull_request.yml
index c9dcd65f..1e72d66c 100644
--- a/.github/workflows/create_release_pull_request.yml
+++ b/.github/workflows/create_release_pull_request.yml
@@ -4,9 +4,12 @@ on:
   workflow_dispatch:
     inputs:
       nextVersion:
-        description: "Next version (eg. 1.0.0)"
+        description: "Next version (eg. 1.0.0)x"
         required: true
         type: string
+  push:
+    branches: 
+      - feature/557-automate-release-pull-request-creation-process
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -64,15 +67,15 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          branch: chore/bump-version-to-${{ github.event.inputs.nextVersion }}
+          branch: chore/bump-version-to-1.1.0
 
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          ref: chore/bump-version-to-${{ github.event.inputs.nextVersion }}
+          ref: chore/bump-version-to-1.1.0
 
       - name: Bump version
-        run: sed -i "" "s/MARKETING_VERSION = .*/MARKETING_VERSION = ${{ github.event.inputs.nextVersion }};/g" Smashburger.xcodeproj/project.pbxproj
+        run: sed -i "" "s/MARKETING_VERSION = .*/MARKETING_VERSION = 1.1.0;/g" Smashburger.xcodeproj/project.pbxproj
       
       - name: Set up Git
         run: |
@@ -82,12 +85,12 @@ jobs:
       - name: Commit changes
         run: |
           git add .
-          git commit -m "[Chore] Bump version to ${{ github.event.inputs.nextVersion }}"
+          git commit -m "[Chore] Bump version to 1.1.0"
           git push origin HEAD
 
       - name: Create pull request
         run: |
-          echo -e "## What happened 👀\n\nBump version to ${{ github.event.inputs.nextVersion }}" > body
-          export body=$(cat body) ; gh pr create --draft -B develop -H chore/bump-version-to-${{ github.event.inputs.nextVersion }} -t '[Chore] Bump version to ${{ github.event.inputs.nextVersion }}' -b "$body"
+          echo -e "## What happened 👀\n\nBump version to 1.1.0" > body
+          export body=$(cat body) ; gh pr create --draft -B develop -H chore/bump-version-to-1.1.0 -t '[Chore] Bump version to 1.1.0' -b "$body"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}