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.

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

Replace last global state block in api.reset #1029

Merged
merged 1 commit into from
Apr 3, 2018

Conversation

starkos
Copy link
Member

@starkos starkos commented Apr 2, 2018

Follow up to #1021: I removed the state blocks added by the tests, but neglected to put back a new, empty global state block for the next run.

Follow up to premake#1021: I removed the state blocks added by the tests, but neglected to put back a new, empty global state block for the next run.
Copy link
Member

@samsinsane samsinsane left a comment

Choose a reason for hiding this comment

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

LGTM, I have no idea why that one macOS build won't work. It's looking for your branch in this repo instead of your repo, but the Linux build did the same thing and worked. None of the other open PRs has the check continuous-integration/travis-ci/push they only have continuous-integration/travis-ci/pr. You might need to push the branch again or something?

I'm happy to merge as-is given that your "pr" check works and the changes are minimal. I'll leave it up to you.

@starkos starkos merged commit 5ee5d65 into premake:master Apr 3, 2018
@starkos starkos deleted the improve-api-reset branch April 3, 2018 10:39
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.

2 participants