diff --git a/dev/release/post-13-website.sh b/dev/release/post-13-website.sh index 950ac46f44..670da98729 100755 --- a/dev/release/post-13-website.sh +++ b/dev/release/post-13-website.sh @@ -68,7 +68,8 @@ limitations under the License. The Apache Arrow team is pleased to announce the version ${RELEASE} release of the Apache Arrow ADBC libraries. This release includes [**${RESOLVED_ISSUES} -resolved issues**][1] from [**${contributors} distinct contributors**][2]. +resolved issues**][1] and [**${MERGED_PRS} merged pull requests**][2] from +[**${contributors} distinct contributors**](#contributors). This is a release of the **libraries**, which are at version ${RELEASE}. The [**API specification**][specification] is versioned separately and is at @@ -79,6 +80,7 @@ The subcomponents are versioned independently: - C/C++/GLib/Go/Python/Ruby: ${VERSION_NATIVE} - C#: ${VERSION_CSHARP} - Java: ${VERSION_JAVA} +- JavaScript: ${VERSION_JS} - R: ${VERSION_R} - Rust: ${VERSION_RUST} @@ -90,6 +92,7 @@ been made: we refer you to the [complete changelog][3]. + ## Contributors \`\`\` @@ -107,8 +110,8 @@ We welcome questions and contributions from all interested. Issues can be filed on [GitHub][4], and questions can be directed to GitHub or the [Arrow mailing lists][5]. -[1]: ${MILESTONE_URL} -[2]: #contributors +[1]: ${ISSUES_URL} +[2]: ${PRS_URL} [3]: https://github.com/apache/arrow-adbc/blob/apache-arrow-adbc-${RELEASE}/CHANGELOG.md [4]: https://github.com/apache/arrow-adbc/issues [5]: {% link community.md %} diff --git a/dev/release/utils-prepare.sh b/dev/release/utils-prepare.sh index ba3a0a5a88..3b211ee132 100644 --- a/dev/release/utils-prepare.sh +++ b/dev/release/utils-prepare.sh @@ -223,7 +223,7 @@ set_resolved_issues() { --jq ".[] | select(.title | test(\"ADBC Libraries ${version}\$\"))") local -r milestone_number=$(echo "${milestone_info}" | jq -r '.number') - local -r graphql_query="query { + local -r resolved_issues_query="query { repository(owner: \"apache\", name: \"arrow-adbc\") { milestone(number: ${milestone_number}) { issues(states: CLOSED) { @@ -234,8 +234,20 @@ set_resolved_issues() { } " + local -r merged_prs_query="query { + search(type: ISSUE, query: \"type:pr repo:apache/arrow-adbc milestone:\\\"ADBC Libraries ${version}\\\" -author:app/dependabot\") { + issueCount + } +}" + + local -r urlencoded=$(echo -n "ADBC Libraries ${version}" | jq -sRr @uri) + export ISSUES_URL="https://github.com/apache/arrow-adbc/issues?q=is%3Aissue%20state%3Aclosed%20milestone%3A%22${urlencoded}%22" + export PRS_URL="https://github.com/apache/arrow-adbc/pulls?q=is%3Apr%20state%3Aclosed%20milestone%3A%22${urlencoded}%22%20-author%3Aapp%2Fdependabot" export MILESTONE_URL=$(echo "${milestone_info}" | jq -r '.html_url') export RESOLVED_ISSUES=$(gh api graphql \ - -f query="${graphql_query}" \ + -f query="${resolved_issues_query}" \ --jq '.data.repository.milestone.issues.totalCount') + export MERGED_PRS=$(gh api graphql \ + -f query="${merged_prs_query}" \ + --jq '.data.search.issueCount') }