Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(pagination): when tagging release, use updated, vs., created #708

Merged
merged 1 commit into from
Jan 16, 2021
Merged

fix(pagination): when tagging release, use updated, vs., created #708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/github-release.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,9 @@ export class GitHubRelease {
pageSize,
this.monorepoTags
? packageBranchPrefix(this.packageName, this.releaseType)
: undefined
: undefined,
true,
'updated'
);
if (!gitHubReleasePR) {
checkpoint('no recent release PRs found', CheckpointType.Failure);
Expand Down
5 changes: 3 additions & 2 deletions src/github.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,8 @@ export class GitHub {
labels: string[],
perPage = 100,
branchPrefix: string | undefined = undefined,
preRelease = true
preRelease = true,
sort = 'created'
): Promise<GitHubReleasePR | undefined> {
branchPrefix = branchPrefix?.endsWith('-')
? branchPrefix.replace(/-$/, '')
Expand All @@ -561,7 +562,7 @@ export class GitHub {
const pullsResponse = (await this.request(
`GET /repos/:owner/:repo/pulls?state=closed&per_page=${perPage}${
this.proxyKey ? `&key=${this.proxyKey}` : ''
}&sort=updated&direction=desc`,
}&sort=${sort}&direction=desc`,
{
owner: this.owner,
repo: this.repo,
Expand Down
22 changes: 11 additions & 11 deletions test/github.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ describe('GitHub', () => {
];
req
.get(
'/repos/fake/fake/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/fake/fake/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, sampleResults);
const latestTag = await github.latestTag('complex-package_name-v1-');
Expand Down Expand Up @@ -338,7 +338,7 @@ describe('GitHub', () => {
];
req
.get(
'/repos/fake/fake/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/fake/fake/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, sampleResults);
const latestTag = await github.latestTag();
Expand All @@ -349,7 +349,7 @@ describe('GitHub', () => {
it('returns the latest tag on the main branch, based on PR date', async () => {
req
.get(
'/repos/fake/fake/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/fake/fake/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, samplePrReturn);
const latestTag = await github.latestTag();
Expand All @@ -367,7 +367,7 @@ describe('GitHub', () => {

req
.get(
'/repos/fake/fake/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/fake/fake/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, samplePrReturn);
const latestTag = await github.latestTag();
Expand All @@ -378,7 +378,7 @@ describe('GitHub', () => {
it('does not return pre-releases as latest tag', async () => {
req
.get(
'/repos/fake/fake/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/fake/fake/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, samplePrReturn);
const latestTag = await github.latestTag();
Expand All @@ -389,7 +389,7 @@ describe('GitHub', () => {
it('returns pre-releases on the main branch as latest, when preRelease is true', async () => {
req
.get(
'/repos/fake/fake/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/fake/fake/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, samplePrReturn);
const latestTag = await github.latestTag(undefined, true);
Expand All @@ -407,7 +407,7 @@ describe('GitHub', () => {

req
.get(
'/repos/fake/fake/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/fake/fake/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, samplePrReturn);
const latestTag = await github.latestTag(undefined, true);
Expand All @@ -417,7 +417,7 @@ describe('GitHub', () => {
it('falls back to using tags, for simple case', async () => {
req
.get(
'/repos/fake/fake/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/fake/fake/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, [])
.get('/repos/fake/fake/tags?per_page=100')
Expand All @@ -438,7 +438,7 @@ describe('GitHub', () => {
it('falls back to using tags, when prefix is provided', async () => {
req
.get(
'/repos/fake/fake/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/fake/fake/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, [])
.get('/repos/fake/fake/tags?per_page=100')
Expand Down Expand Up @@ -467,7 +467,7 @@ describe('GitHub', () => {
it('allows for "@" rather than "-" when fallback used', async () => {
req
.get(
'/repos/fake/fake/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/fake/fake/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, [])
.get('/repos/fake/fake/tags?per_page=100')
Expand Down Expand Up @@ -500,7 +500,7 @@ describe('GitHub', () => {
it('allows for "/" rather than "-" when fallback used', async () => {
req
.get(
'/repos/fake/fake/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/fake/fake/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, [])
.get('/repos/fake/fake/tags?per_page=100')
Expand Down
8 changes: 4 additions & 4 deletions test/release-pr-factory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ describe('ReleasePRFactory', () => {
);
const req = nock('https://api.github.com')
.get(
'/repos/googleapis/simple-test-repo/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/simple-test-repo/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, undefined)
// fetch semver tags, this will be used to determine
// the delta since the last release.
.get(
'/repos/googleapis/simple-test-repo/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/simple-test-repo/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, [
{
Expand Down Expand Up @@ -146,13 +146,13 @@ describe('ReleasePRFactory', () => {
);
const req = nock('https://api.github.com')
.get(
'/repos/googleapis/simple-test-repo/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/simple-test-repo/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, undefined)
// fetch semver tags, this will be used to determine
// the delta since the last release.
.get(
'/repos/googleapis/simple-test-repo/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/simple-test-repo/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, [
{
Expand Down
4 changes: 2 additions & 2 deletions test/release-pr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@ describe('Release-PR', () => {
// check to see if this PR was already landed and we're
// just waiting on the autorelease.
.get(
'/repos/googleapis/release-please/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/release-please/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, undefined)
// fetch semver tags, this will be used to determine
// the delta since the last release.
.get(
'/repos/googleapis/release-please/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/release-please/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, [
{
Expand Down
18 changes: 9 additions & 9 deletions test/releasers/java-bom.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ describe('JavaBom', () => {
);
const req = nock('https://api.github.com')
.get(
'/repos/googleapis/java-cloud-bom/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/java-cloud-bom/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, undefined)
.get(
Expand All @@ -76,7 +76,7 @@ describe('JavaBom', () => {
// fetch semver tags, this will be used to determine
// the delta since the last release.
.get(
'/repos/googleapis/java-cloud-bom/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/java-cloud-bom/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, [
{
Expand Down Expand Up @@ -188,7 +188,7 @@ describe('JavaBom', () => {
);
const req = nock('https://api.github.com')
.get(
'/repos/googleapis/java-cloud-bom/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/java-cloud-bom/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, undefined)
.get(
Expand All @@ -209,7 +209,7 @@ describe('JavaBom', () => {
// fetch semver tags, this will be used to determine
// the delta since the last release.
.get(
'/repos/googleapis/java-cloud-bom/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/java-cloud-bom/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, [
{
Expand Down Expand Up @@ -291,7 +291,7 @@ describe('JavaBom', () => {
default_branch: 'master',
})
.get(
'/repos/googleapis/java-cloud-bom/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/java-cloud-bom/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, undefined)
.get(
Expand Down Expand Up @@ -338,7 +338,7 @@ describe('JavaBom', () => {
);
const req = nock('https://api.github.com')
.get(
'/repos/googleapis/java-cloud-bom/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/java-cloud-bom/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, undefined)
.get(
Expand All @@ -359,7 +359,7 @@ describe('JavaBom', () => {
// fetch semver tags, this will be used to determine
// the delta since the last release.
.get(
'/repos/googleapis/java-cloud-bom/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/java-cloud-bom/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, [
{
Expand Down Expand Up @@ -459,7 +459,7 @@ describe('JavaBom', () => {
);
const req = nock('https://api.github.com')
.get(
'/repos/googleapis/java-cloud-bom/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/java-cloud-bom/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, undefined)
.get(
Expand All @@ -475,7 +475,7 @@ describe('JavaBom', () => {
// fetch semver tags, this will be used to determine
// the delta since the last release.
.get(
'/repos/googleapis/java-cloud-bom/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/java-cloud-bom/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, [
{
Expand Down
22 changes: 11 additions & 11 deletions test/releasers/java-yoshi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ describe('JavaYoshi', () => {
.get('/repos/googleapis/java-trace/pulls?state=open&per_page=100')
.reply(200, [])
.get(
'/repos/googleapis/java-trace/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/java-trace/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, undefined)
.get(
Expand All @@ -76,7 +76,7 @@ describe('JavaYoshi', () => {
// fetch semver tags, this will be used to determine
// the delta since the last release.
.get(
'/repos/googleapis/java-trace/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/java-trace/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, [
{
Expand Down Expand Up @@ -206,7 +206,7 @@ describe('JavaYoshi', () => {
const pomContents = readFileSync(resolve(fixturesPath, 'pom.xml'), 'utf8');
const req = nock('https://api.github.com')
.get(
'/repos/googleapis/java-trace/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/java-trace/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, undefined)
// This step looks for release PRs that are already open:
Expand All @@ -222,7 +222,7 @@ describe('JavaYoshi', () => {
// fetch semver tags, this will be used to determine
// the delta since the last release.
.get(
'/repos/googleapis/java-trace/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/java-trace/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, [
{
Expand Down Expand Up @@ -326,7 +326,7 @@ describe('JavaYoshi', () => {
const pomContents = readFileSync(resolve(fixturesPath, 'pom.xml'), 'utf8');
const req = nock('https://api.github.com')
.get(
'/repos/googleapis/java-trace/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/java-trace/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, undefined)
// This step looks for release PRs that are already open:
Expand All @@ -342,7 +342,7 @@ describe('JavaYoshi', () => {
// fetch semver tags, this will be used to determine
// the delta since the last release.
.get(
'/repos/googleapis/java-trace/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/java-trace/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, [
{
Expand Down Expand Up @@ -439,7 +439,7 @@ describe('JavaYoshi', () => {
default_branch: 'master',
})
.get(
'/repos/googleapis/java-trace/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/java-trace/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, undefined)
.get(
Expand Down Expand Up @@ -480,7 +480,7 @@ describe('JavaYoshi', () => {
const pomContents = readFileSync(resolve(fixturesPath, 'pom.xml'), 'utf8');
const req = nock('https://api.github.com')
.get(
'/repos/googleapis/java-trace/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/java-trace/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, undefined)
// This step looks for release PRs that are already open:
Expand All @@ -496,7 +496,7 @@ describe('JavaYoshi', () => {
// fetch semver tags, this will be used to determine
// the delta since the last release.
.get(
'/repos/googleapis/java-trace/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/java-trace/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, [
{
Expand Down Expand Up @@ -614,7 +614,7 @@ describe('JavaYoshi', () => {
.get('/repos/googleapis/java-trace/pulls?state=open&per_page=100')
.reply(200, [])
.get(
'/repos/googleapis/java-trace/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/java-trace/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, undefined)
.get(
Expand All @@ -627,7 +627,7 @@ describe('JavaYoshi', () => {
// fetch semver tags, this will be used to determine
// the delta since the last release.
.get(
'/repos/googleapis/java-trace/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/java-trace/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, [
{
Expand Down
4 changes: 2 additions & 2 deletions test/releasers/node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ function mockRequest(snapName: string, requestPrefix = '') {
// eslint-disable-next-line @typescript-eslint/no-var-requires
.reply(200, require('../../../test/fixtures/repo-get-1.json'))
.get(
'/repos/googleapis/node-test-repo/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/node-test-repo/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, undefined)
.get(
Expand All @@ -57,7 +57,7 @@ function mockRequest(snapName: string, requestPrefix = '') {
// fetch semver tags, this will be used to determine
// the delta since the last release.
.get(
'/repos/googleapis/node-test-repo/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/node-test-repo/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, [
{
Expand Down
4 changes: 2 additions & 2 deletions test/releasers/yoshi-go.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ describe('YoshiGo', () => {
const req = nock('https://api.github.com')
// Check for in progress, merged release PRs:
.get(
'/repos/googleapis/google-cloud-go/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/google-cloud-go/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, undefined)
// Check for existing open release PRs.
Expand All @@ -62,7 +62,7 @@ describe('YoshiGo', () => {
// fetch semver tags, this will be used to determine
// the delta since the last release.
.get(
'/repos/googleapis/google-cloud-go/pulls?state=closed&per_page=100&sort=updated&direction=desc'
'/repos/googleapis/google-cloud-go/pulls?state=closed&per_page=100&sort=created&direction=desc'
)
.reply(200, [
{
Expand Down