Skip to content

Commit 8447bbf

Browse files
committed
Use main instead of master when collecting PR descriptions
Also drop "base=master" from the GET request that is sent to GitHub api to collect merged PRs, this shouldn't anyway.
1 parent 1bdd130 commit 8447bbf

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

automated_packaging/common_functions.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ sub get_sorted_prs {
6565
my $page_number = 1;
6666
$merged_date = "2100-12-12";
6767
do {
68-
my $prs_text = `curl -H "Accept: application/vnd.github.v3.full+json" -X GET --user "$github_token:x-oauth-basic" 'https://api.github.com/repos/citusdata/$repo_name/pulls?base=master&state=all&page=$page_number' 2> /dev/null`;
68+
my $prs_text = `curl -H "Accept: application/vnd.github.v3.full+json" -X GET --user "$github_token:x-oauth-basic" 'https://api.github.com/repos/citusdata/$repo_name/pulls?state=all&page=$page_number' 2> /dev/null`;
6969
my @prs = @{decode_json($prs_text)};
7070

7171
foreach my $pr (@prs) {

automated_packaging/prepare_changelog.pl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ ()
2525

2626
$github_token = get_and_verify_token();
2727

28-
# Checkout the master branch
29-
`git checkout master`;
28+
# Checkout the main branch
29+
`git checkout main`;
3030

31-
# Now create a new branch based on master
31+
# Now create a new branch based on main
3232
`git checkout -b $PROJECT-$NEW_VERSION-changelog-$curTime`;
3333

3434
# Read the current changelog
@@ -49,4 +49,4 @@ ()
4949
# Commit and push the changes, then open a PR
5050
`git commit -a -m "Add changelog entry for $NEW_VERSION"`;
5151
`git push origin $PROJECT-$NEW_VERSION-changelog-$curTime`;
52-
`curl -g -H "Accept: application/vnd.github.v3.full+json" -X POST --user "$github_token:x-oauth-basic" -d '{\"title\":\"Bump $PROJECT to $NEW_VERSION\", \"base\":\"master\", \"head\":\"$PROJECT-$NEW_VERSION-changelog-$curTime\"}' https://api.github.com/repos/citusdata/$PROJECT/pulls`;
52+
`curl -g -H "Accept: application/vnd.github.v3.full+json" -X POST --user "$github_token:x-oauth-basic" -d '{\"title\":\"Bump $PROJECT to $NEW_VERSION\", \"base\":\"main\", \"head\":\"$PROJECT-$NEW_VERSION-changelog-$curTime\"}' https://api.github.com/repos/citusdata/$PROJECT/pulls`;

0 commit comments

Comments
 (0)