Skip to content

Commit

Permalink
fix: issues found by testing with the GCP ruby repo (#587)
Browse files Browse the repository at this point in the history
* fix: handle complex "composite" branch names for monorepos

* fix handling of extracting versions from branch names, and sort by merged_at rather than updated

* merge changes to graphql from bcoe's branch

* look for merge PRs by merge time, not updated time (other things might update them too)

* update branch name matching logic to better handle monorepos, and update fixture files for recent graphql updates

* test: get tests passing

* fix: allow initial release to fallback to tag

Co-authored-by: bcoe <bencoe@google.com>
  • Loading branch information
feywind and bcoe committed Oct 16, 2020
1 parent 0850224 commit ab9f97c
Show file tree
Hide file tree
Showing 24 changed files with 2,110 additions and 1,658 deletions.
37 changes: 36 additions & 1 deletion __snapshots__/commit-split.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ exports['CommitSplit partitions commits based on path from root directory by def
],
'Datastore': [
{
'sha': 'cf52ec0bcdc777dc9c5e76153d7d253bea95d44b',
'sha': '269cf923ea6fd0375abaf0bb19790475693c6f90',
'message': 'fix: Assorted minor fixes for Cloud Datastore client (#1964)',
'files': [
'Datastore/src/Connection/Grpc.php',
Expand Down Expand Up @@ -82,6 +82,13 @@ exports['CommitSplit partitions commits based on path from root directory by def
'src/ServiceBuilder.php',
'src/Version.php'
]
},
{
'sha': 'a8b5b0bc9e9ed7998e30983834f7d841b6a37d6f',
'message': 'fix: continue switch targeting warning in PHP 7.3 (#1957)',
'files': [
'Debugger/src/Agent.php'
]
}
],
'Dialogflow': [
Expand Down Expand Up @@ -134,6 +141,27 @@ exports['CommitSplit partitions commits based on path from root directory by def
'src/ServiceBuilder.php',
'src/Version.php'
]
},
{
'sha': 'cf52ec0bcdc777dc9c5e76153d7d253bea95d44b',
'message': 'feat: Add Collection Group Query support (#1944)\n\n* Add Collection Group Query support\r\n\r\n* Fix documentation\r\n\r\n* Address code review\r\n\r\n* Throw from createDocumentReference',
'files': [
'Firestore/src/Connection/Grpc.php',
'Firestore/src/FieldPath.php',
'Firestore/src/FirestoreClient.php',
'Firestore/src/Query.php',
'Firestore/src/SnapshotTrait.php',
'Firestore/tests/Snippet/CollectionReferenceTest.php',
'Firestore/tests/Snippet/FieldPathTest.php',
'Firestore/tests/Snippet/FirestoreClientTest.php',
'Firestore/tests/Snippet/QueryTest.php',
'Firestore/tests/System/CollectionGroupTest.php',
'Firestore/tests/System/FirestoreTestCase.php',
'Firestore/tests/Unit/CollectionReferenceTest.php',
'Firestore/tests/Unit/FieldPathTest.php',
'Firestore/tests/Unit/FirestoreClientTest.php',
'Firestore/tests/Unit/QueryTest.php'
]
}
],
'Language': [
Expand All @@ -160,6 +188,13 @@ exports['CommitSplit partitions commits based on path from root directory by def
'src/ServiceBuilder.php',
'src/Version.php'
]
},
{
'sha': 'bf69d0f204474b88b3f8b5a72a392129d16a3929',
'message': 'fix: language system test (#1958)',
'files': [
'Language/tests/System/AnalyzeTest.php'
]
}
],
'Speech': [
Expand Down
175 changes: 175 additions & 0 deletions __snapshots__/github.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 37 additions & 2 deletions __snapshots__/graphql-to-commits.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
exports['graphqlToCommits converts raw graphql response into Commits object 1'] = {
'endCursor': '0a8477108a26aeb21d7af06e62be4ae5cb00ad42 31',
'hasNextPage': false,
'hasNextPage': true,
'commits': [
{
'sha': '0a8477108a26aeb21d7af06e62be4ae5cb00ad42',
Expand All @@ -11,7 +11,7 @@ exports['graphqlToCommits converts raw graphql response into Commits object 1']
]
},
{
'sha': 'cf52ec0bcdc777dc9c5e76153d7d253bea95d44b',
'sha': '269cf923ea6fd0375abaf0bb19790475693c6f90',
'message': 'fix: Assorted minor fixes for Cloud Datastore client (#1964)',
'files': [
'Datastore/src/Connection/Grpc.php',
Expand Down Expand Up @@ -170,6 +170,41 @@ exports['graphqlToCommits converts raw graphql response into Commits object 1']
'Speech/src/V1p1beta1/SpeechContext.php',
'Speech/synth.metadata'
]
},
{
'sha': 'bf69d0f204474b88b3f8b5a72a392129d16a3929',
'message': 'fix: language system test (#1958)',
'files': [
'Language/tests/System/AnalyzeTest.php'
]
},
{
'sha': 'a8b5b0bc9e9ed7998e30983834f7d841b6a37d6f',
'message': 'fix: continue switch targeting warning in PHP 7.3 (#1957)',
'files': [
'Debugger/src/Agent.php'
]
},
{
'sha': 'cf52ec0bcdc777dc9c5e76153d7d253bea95d44b',
'message': 'feat: Add Collection Group Query support (#1944)\n\n* Add Collection Group Query support\r\n\r\n* Fix documentation\r\n\r\n* Address code review\r\n\r\n* Throw from createDocumentReference',
'files': [
'Firestore/src/Connection/Grpc.php',
'Firestore/src/FieldPath.php',
'Firestore/src/FirestoreClient.php',
'Firestore/src/Query.php',
'Firestore/src/SnapshotTrait.php',
'Firestore/tests/Snippet/CollectionReferenceTest.php',
'Firestore/tests/Snippet/FieldPathTest.php',
'Firestore/tests/Snippet/FirestoreClientTest.php',
'Firestore/tests/Snippet/QueryTest.php',
'Firestore/tests/System/CollectionGroupTest.php',
'Firestore/tests/System/FirestoreTestCase.php',
'Firestore/tests/Unit/CollectionReferenceTest.php',
'Firestore/tests/Unit/FieldPathTest.php',
'Firestore/tests/Unit/FirestoreClientTest.php',
'Firestore/tests/Unit/QueryTest.php'
]
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion __snapshots__/release-pr.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ exports['Release-PR Yoshi PHP Mono-Repo generates CHANGELOG and aborts if duplic
[
"CHANGELOG.md",
{
"content": "# Changelog\\n\\n## 0.21.0\\n\\n<details><summary>automl 1.8.4</summary>\\n\\n\\n\\n### Bug Fixes\\n\\n* correctly label as beta ([#1963](https://www.github.com/googleapis/release-please/issues/1963)) ([52f4fbf](https://www.github.com/googleapis/release-please/commit/52f4fbfa1fc3fde585c84e64ef40571d2b85d72e))\\n\\n</details>\\n\\n<details><summary>datastore 2.0.1</summary>\\n\\n\\n\\n### Bug Fixes\\n\\n* Assorted minor fixes for Cloud Datastore client ([#1964](https://www.github.com/googleapis/release-please/issues/1964)) ([cf52ec0](https://www.github.com/googleapis/release-please/commit/cf52ec0bcdc777dc9c5e76153d7d253bea95d44b))\\n\\n</details>\\n\\n<details><summary>pubsub 1.0.2</summary>\\n\\n\\n\\n### Bug Fixes\\n\\n* Update PubSub timeouts. ([#1967](https://www.github.com/googleapis/release-please/issues/1967)) ([0a84771](https://www.github.com/googleapis/release-please/commit/0a8477108a26aeb21d7af06e62be4ae5cb00ad42))\\n\\n</details>\\n\\n<details><summary>speech 1.1.0</summary>\\n\\n\\n\\n### Features\\n\\n* Add mp3 encoding and context hint boost support. ([#1959](https://www.github.com/googleapis/release-please/issues/1959)) ([da6e52d](https://www.github.com/googleapis/release-please/commit/da6e52d956c1e35d19e75e0f2fdba439739ba364))\\n* move speech from alpha -> beta ([#1962](https://www.github.com/googleapis/release-please/issues/1962)) ([8db7f3b](https://www.github.com/googleapis/release-please/commit/8db7f3b19c46c873897d79c89ce35b8492e5fe60))\\n\\n</details>\\n\\n<details><summary>websecurityscanner 0.9.0</summary>\\n\\n\\n\\n### Features\\n\\n* Add Web Security Center Client ([#1961](https://www.github.com/googleapis/release-please/issues/1961)) ([fa5761e](https://www.github.com/googleapis/release-please/commit/fa5761e9e52f36506a72a9292843259d198468b0))\\n\\n</details>\\n",
"content": "# Changelog\\n\\n## 0.21.0\\n\\n<details><summary>automl 1.8.4</summary>\\n\\n\\n\\n### Bug Fixes\\n\\n* correctly label as beta ([#1963](https://www.github.com/googleapis/release-please/issues/1963)) ([52f4fbf](https://www.github.com/googleapis/release-please/commit/52f4fbfa1fc3fde585c84e64ef40571d2b85d72e))\\n\\n</details>\\n\\n<details><summary>datastore 2.0.1</summary>\\n\\n\\n\\n### Bug Fixes\\n\\n* Assorted minor fixes for Cloud Datastore client ([#1964](https://www.github.com/googleapis/release-please/issues/1964)) ([269cf92](https://www.github.com/googleapis/release-please/commit/269cf923ea6fd0375abaf0bb19790475693c6f90))\\n\\n</details>\\n\\n<details><summary>pubsub 1.0.2</summary>\\n\\n\\n\\n### Bug Fixes\\n\\n* Update PubSub timeouts. ([#1967](https://www.github.com/googleapis/release-please/issues/1967)) ([0a84771](https://www.github.com/googleapis/release-please/commit/0a8477108a26aeb21d7af06e62be4ae5cb00ad42))\\n\\n</details>\\n\\n<details><summary>speech 1.1.0</summary>\\n\\n\\n\\n### Features\\n\\n* Add mp3 encoding and context hint boost support. ([#1959](https://www.github.com/googleapis/release-please/issues/1959)) ([da6e52d](https://www.github.com/googleapis/release-please/commit/da6e52d956c1e35d19e75e0f2fdba439739ba364))\\n* move speech from alpha -> beta ([#1962](https://www.github.com/googleapis/release-please/issues/1962)) ([8db7f3b](https://www.github.com/googleapis/release-please/commit/8db7f3b19c46c873897d79c89ce35b8492e5fe60))\\n\\n</details>\\n\\n<details><summary>websecurityscanner 0.9.0</summary>\\n\\n\\n\\n### Features\\n\\n* Add Web Security Center Client ([#1961](https://www.github.com/googleapis/release-please/issues/1961)) ([fa5761e](https://www.github.com/googleapis/release-please/commit/fa5761e9e52f36506a72a9292843259d198468b0))\\n\\n</details>\\n",
"mode": "100644"
}
]
Expand Down
Loading

0 comments on commit ab9f97c

Please sign in to comment.