Skip to content

build: make make ignore go files in testdata directories#25215

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
knz:20180501-make
May 1, 2018
Merged

build: make make ignore go files in testdata directories#25215
craig[bot] merged 1 commit intocockroachdb:masterfrom
knz:20180501-make

Conversation

@knz
Copy link
Copy Markdown
Contributor

@knz knz commented May 1, 2018

Otherwise the special file in pkg/cmd/prereqs/testdata will break.

Ideally we'll want to use the 'prereqs' tool instead. For now this will do.

Release note: none

Otherwise the special file in pkg/cmd/prereqs/testdata will break.

Ideally we'll want to use the 'prereqs' tool instead. For now this will do.

Release note: none
@knz knz requested review from a team and benesch May 1, 2018 18:41
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Contributor

@benesch benesch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@knz
Copy link
Copy Markdown
Contributor Author

knz commented May 1, 2018

thanks!

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented May 1, 2018

Build failed (retrying...)

craig bot pushed a commit that referenced this pull request May 1, 2018
25190: sql: fix information_schema.constraint_column_usage.constraint_schema r=nvanbenschoten a=nvanbenschoten

Found while working on #22298.

This column was missed in #22753. It was displaying each constraint's
database instead of each constraint's schema.

Release note (bug fix): The constraint_schema column in
information_schema.constraint_column_usage now displays the
constraint's schema instead of its catalog.

25215: build: make make ignore go files in testdata directories r=knz a=knz

Otherwise the special file in pkg/cmd/prereqs/testdata will break.

Ideally we'll want to use the 'prereqs' tool instead. For now this will do.

Release note: none

Co-authored-by: Nathan VanBenschoten <nvanbenschoten@gmail.com>
Co-authored-by: Raphael 'kena' Poss <knz@cockroachlabs.com>
@craig
Copy link
Copy Markdown
Contributor

craig bot commented May 1, 2018

Build succeeded

@craig craig bot merged commit 1d68d65 into cockroachdb:master May 1, 2018
@knz knz deleted the 20180501-make branch July 2, 2018 09:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants