fix: base as part of branch, explicit remote

barredterra · Feb 11, 2024 · 3675194 · 3675194
1 parent fba4330
commit 3675194
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/helper/update_pot_file.sh b/.github/helper/update_pot_file.sh
@@ -23,7 +23,7 @@ git remote set-url upstream https://github.com/barredterra/frappe.git
 
 echo "Creating a new branch..."
 isodate=$(date -u +"%Y-%m-%d")
-branch_name="update-pot-file_${isodate}"
+branch_name="pot_${BASE_BRANCH}_${isodate}"
 git checkout -b "${branch_name}"
 
 echo "Commiting changes..."
@@ -34,4 +34,4 @@ gh auth setup-git
 git push -u upstream "${branch_name}"
 
 echo "Creating a PR..."
-gh pr create --fill --base "${BRANCH}" --head "${branch_name}"
+gh pr create --fill --base "${BASE_BRANCH}" --head "${branch_name}" -R barredterra/frappe
diff --git a/.github/workflows/generate-pot-file.yml b/.github/workflows/generate-pot-file.yml
@@ -35,4 +35,4 @@ jobs:
             bash ${GITHUB_WORKSPACE}/.github/helper/update_pot_file.sh
           env:
             GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-            BRANCH: ${{ matrix.branch }}
+            BASE_BRANCH: ${{ matrix.branch }}