diff --git a/.github/workflows/create_pr_on_pr.yml b/.github/workflows/create_pr_on_pr.yml index 9f1a9638..d4724538 100644 --- a/.github/workflows/create_pr_on_pr.yml +++ b/.github/workflows/create_pr_on_pr.yml @@ -66,14 +66,14 @@ jobs: latest_commit_en_branch=$(git show --format=%H -s ${EN_BRANCH}) latest_commit_info=$(git log ${EN_BRANCH} --since="$latest_commit_date" --format="%H %s" --reverse) commit_messages=$(echo "$latest_commit_info" | cut -d' ' -f2-) - latest_commit_main=$(git show --format=%H -s origin/main) + latest_commit_master=$(git show --format=%H -s origin/master) echo $latest_commit_en_branch - echo $latest_commit_main + echo $latest_commit_master echo $latest_commit_info # Check if there are new commits - if [ "$latest_commit_en_branch" == "$latest_commit_main" ]; then + if [ "$latest_commit_en_branch" == "$latest_commit_master" ]; then echo "No new commits to include in PR for ${TRANSLATION_BRANCH}" continue fi @@ -82,7 +82,7 @@ jobs: PR_EXISTS=$(gh pr list --head "${TRANSLATION_BRANCH}" --state open --json number --jq length) if [ "$PR_EXISTS" -eq 0 ]; then echo "Creating new PR for ${TRANSLATION_BRANCH}" - PR_URL=$(gh pr create --base main --head "$TRANSLATION_BRANCH" --title "Handbook ${VERSION_SUFFIX/_en/} $lang" --body "Automated pull request for $lang handbook version ${VERSION_SUFFIX/_en/}") + PR_URL=$(gh pr create --base master --head "$TRANSLATION_BRANCH" --title "Handbook ${VERSION_SUFFIX/_en/} $lang" --body "Automated pull request for $lang handbook version ${VERSION_SUFFIX/_en/}") PR_NUMBER=$(echo "$PR_URL" | grep -oE '[0-9]+$') else # Get the PR number for the translation branch